M1-r12784 Editor Fixes

Fix editor definitions for M1-r12784 compatibility.