A few fixes for the alarms addon (issue #13)