diff --git a/projects/harfbuzz/build.sh b/projects/harfbuzz/build.sh
index d088cb444..a802037c7 100755
--- a/projects/harfbuzz/build.sh
+++ b/projects/harfbuzz/build.sh
@@ -17,8 +17,8 @@
 
 # Disable:
 # 1. UBSan vptr since target built with -fno-rtti.
-export CFLAGS="$CFLAGS -fno-sanitize=function,vptr"
-export CXXFLAGS="$CXXFLAGS -fno-sanitize=function,vptr"
+export CFLAGS="$CFLAGS -fno-sanitize=vptr"
+export CXXFLAGS="$CXXFLAGS -fno-sanitize=vptr"
 
 # Build the library.
 ./autogen.sh
@@ -37,5 +37,14 @@ $CXX $CXXFLAGS -std=c++11 -Isrc \
     -lFuzzingEngine ./src/.libs/libharfbuzz-subset-fuzzing.a ./src/.libs/libharfbuzz-fuzzing.a
 
 # Archive and copy to $OUT seed corpus if the build succeeded.
-zip -j -r $OUT/hb-shape-fuzzer_seed_corpus.zip $SRC/harfbuzz/test/shaping/data/in-house/fonts $SRC/harfbuzz/test/shaping/data/text-rendering-tests/fonts $SRC/harfbuzz/test/api/fonts $SRC/harfbuzz/test/fuzzing/fonts
+mkdir all-fonts
+for d in \
+	test/shaping/data/in-house/fonts \
+	test/shaping/data/text-rendering-tests/fonts \
+	test/api/fonts \
+	test/fuzzing/fonts \
+	; do
+	cp $d/* all-fonts/
+done
+zip $OUT/hb-shape-fuzzer_seed_corpus.zip all-fonts/*
 cp $OUT/hb-shape-fuzzer_seed_corpus.zip $OUT/hb-subset-fuzzer_seed_corpus.zip