Small fixes for editor