More minor code fixes from comments in pull request #1736.
Merge pull request #1750 from pjackson28/master

More minor code fixes from comments in pull request #1736