squash: fixed some cppcheck issues