address a few analysis warnings
Merge pull request #3122 from devoncarew/devoncarew_analysis_warnings

address a few analysis warnings