Code: Analysis warning fixes. (#519)
Merge pull request #572 from am11/master

Code: cleanup and analysis warning fixes (#519)