Editing fixes