Fixed 2 bugs in Editor.