[en] more false alarm fixes