Fixed some issues with work-in-editor