Fixed a couple editor bugs