Fixes (cppcheck)