Merge pull request #1720 from TheBlueMatt/2022-09-fix-fuzz-warnings