Code: Analysis fixes.
Merge pull request #986 from am11/master

Code: Analysis fixes