Various editor tweaks