Fix cppcheck 1.67 issues