Merge remote-tracking branch 'tjoppen/fuzz_fixes'