Various fixes to benefit the editor UI