- more fixes from cppcheck