Integrate and fix cppcheck