More editor changes