fix issues related to "None" air force