APC and Air Alarm fixes

Reduces map bloat and fixes issues with the air alarm