fixes for editor