-misc fixes based on cppcheck