Minor editor fixes by HMH