More editor tweaks