Continue editing fixes