Minor fix to editor and events