Enhancements to autopilot mode