Small fixes
Alarms fixed