Editors fixes