Couple more tweaks to -runstep