A typo correction

And a few more things, while I was at it.