2 more fixes to the editor