further editor fixes