Fix bug with alarm
Merge branch 'bugs'