minor edits

15 jobs for cleanup-changes-v9_12 in 8 minutes and 37 seconds (queued for 9 seconds)