Fixups for 9.2

See commit log for details on changes.
That's a good suggestion, thanks.