Small changes to make sure the Alarm fires properly.