Miscellaneous changes

Feel free to use this PR to batch together small, trivial changes that are too small for individual PRs, but useful enough to address. We can probably merge this in before the end of the week.