various fixes in the editing mode