Small improvements to step