Stepper fixes