Partial checkin for fixes to -runstep