Fix editor instantiation