fix some more cppcheck warnings