Some minor tweaks

Commit messages pretty much cover it, I think.