More editor bugs fixed