fixups against master

Here's a few fixups I have against master. Only one of these changes is functional, the rest is cosmetic of relating to docs.

I didn't mark these for squashing, because I already have these squashed in for my next rebase.