Fix some cppcheck

2 jobs for master