[FIX] cppcheck fixes