Improve VTOL management