General fixes, mostly in Alarm