some alarm fixes