Several minor editor bugs