Modifications to editor behaviour