Fix a few things with the step list