[en] further false alarm fixes