Misc. changes
Fixes for airport diagrams