2003.7 - Fixes Follow