A few changes to the AlarmHandler