Fixes for airport