Fixing minor code analysis violations before release 1.15.0
Merge pull request #207 from blairconrad/186-fix-code-violations

Fixing minor code analysis violations before release 1.15.0