Some cleanup for production.

A couple of things I left out on that last pull request.  Committed, but didn't push the commits to GitHub.