Fix AirplaneEnabler bugs

like Bug 7132230