Fixes to typos as well as updates related to 2.9 changes.