Fixes a couple of fuzz flakes that were found when fuzzing heavily.
Attach a file by drag & drop or click to upload
