fixes for editor;