Added AirSpaceFix helper methods