Other edit mode integration changes.