Update to latest airbase, airlift and discovery