Fixed air class to include os x