Several tweaks

I could (should?) have turned these into multiple commits/pull requests, but did not.