Final fixes for editor