Fixed no retract with advance, enforce min speed, potential blocking problems