Fix CppCheck warnings
3 files changed