Fix cppcheck (part 2)