Editor tweaks