diff --git a/bootstrap-mod.sh b/bootstrap-mod.sh
index 6ed42b2..876c512 100755
--- a/bootstrap-mod.sh
+++ b/bootstrap-mod.sh
@@ -73,8 +73,10 @@ fi
 HYLIA_VERSION="6421909123974ffd431ace47589975f5929bc746"
 HYLIA_URL="https://github.com/falkTX/hylia.git"
 
+HYLIA_EXTRAFLAGS="NOOPT=true"
+
 download hylia "${HYLIA_VERSION}" "${HYLIA_URL}" "" "git"
-build_make hylia "${HYLIA_VERSION}"
+build_make hylia "${HYLIA_VERSION}" "${HYLIA_EXTRAFLAGS}"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # aggdraw
@@ -85,12 +87,16 @@ if [ "${WIN32}" -eq 1 ]; then
     export AGGDRAW_FREETYPE_ROOT="${PAWPAW_PREFIX}"
     export EXTRA_CFLAGS="$(${PAWPAW_PREFIX}/bin/pkg-config --cflags python3 freetype2 libpng)"
     export EXTRA_LDFLAGS="-shared $(${PAWPAW_PREFIX}/bin/pkg-config --libs python3 freetype2 libpng) -lgdi32 -lkernel32 -luser32"
+    export LDSHARED="${TARGET_CXX}"
 fi
 
 download aggdraw "${AGGDRAW_VERSION}" "https://files.pythonhosted.org/packages/ef/29/fddf555c68920bb0aff977425af786226db2a78379e706951ff32b4492ef"
 build_python aggdraw "${AGGDRAW_VERSION}"
 
-unset AGGDRAW_FREETYPE_ROOT
+if [ "${WIN32}" -eq 1 ]; then
+    unset AGGDRAW_FREETYPE_ROOT
+    unset LDSHARED
+fi
 
 if [ "${WIN32}" -eq 1 ] && [ "${CROSS_COMPILING}" -eq 1 ]; then
     PYTHONPATH="${PAWPAW_PREFIX}/lib/python3.8/site-packages"