Readd typo fixes after incorrect conflicting merge.