Few necessary tweaks I found while investigating the step size bug.