Tuning the autopilot a bit more