Cleanup of some of the minor issues arising from #1551.
Merge pull request #1565 from pjackson28/master

Cleanup of some of the minor issues arising from #1551