Finish pre-gremlin edits