miscellaneous fixes

a shared branch of innocuous miscellaneous fixes. Feel free to push. Will be rebased after Dec 1, 01:00 UTC and merged.