fix a few analysis warnings
Merge pull request #2165 from devoncarew/devoncarew_various_nits

fix a few analysis warnings