Fixed alarm issues