More fixes to 'Stopping in Between'