three other changes to make cppcheck happier