COMP: Fix Cppcheck and Clang warnings
Merge pull request #67 from jamiesnape/FixCppcheckClangWarnings

COMP: Fix Cppcheck and Clang warnings