Alarm processing bugfixes