Fixed some timing issues with stage steping