Bite Alarm fixes