Code: More analysis warning fixes.
Merge pull request #584 from am11/master

Code: More analysis warning fixes