Updates from Airspace compliance changes