Miscellaneous

I noticed a few minor things so I thought I would offer a PR in case they are helpful. Please see my comments with each commit.