Fixups for 9.2

See commit log for details on changes.
s/to use/to the use/ ?