[en] some false alarm fixes and disambig