manual pilot fixes