Fixes for latest M3 editor.