Minor tweaks to Alarm