Fix last cppcheck warnings