Flight / FlightAll + Fixes