Global Smart Stepping fixes