Fix some cppcheck warnings