alarm bug fixes