APC and Air Alarm fixes

Also minor RP change