Improvements on cppcheck