Editor tweaks again