Fixes bugs related to stepping