Small, miscellaneous fixes

I would have never guessed what this was for from the name. Any thoughts on how we could improve it?