Minor tweaks to editor behaviour