Squashed a number of bugs in the step manager