smal edits in 1.12