Fixed small issues with editor