navigator: takeoff fixes