Minor Fixes

A few minor fixes from feedback on my last pull request.