Autopilot merging fixes.