fixed two editor issues