Fixed up some editing issues that cropped up after breaking workflow.