Fixed up some of the editing situations