- Fixed cppcheck warnings