More editor fixes