Fix editing issues