diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh
index a2415e9..6d4d536 100755
--- a/bootstrap-carla.sh
+++ b/bootstrap-carla.sh
@@ -84,16 +84,18 @@ fi
 # python
 
 download Python "${PYTHON_VERSION}" "https://www.python.org/ftp/python/${PYTHON_VERSION}" "tgz"
-if [ "${MACOS}" -eq 0 ]; then
-    patch_file Python "${PYTHON_VERSION}" "Modules/Setup.dist" 's/#zlib zlibmodule.c/zlib zlibmodule.c/'
-fi
+patch_file Python "${PYTHON_VERSION}" "Modules/Setup.dist" 's/#zlib zlibmodule.c/zlib zlibmodule.c/'
 build_conf Python "${PYTHON_VERSION}" "--prefix=${PAWPAW_PREFIX} --enable-optimizations --enable-shared"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # sip
 
+if [ "${SIP_VERSION}" = "4.19.19" ]; then
+    SIP_EXTRAFLAGS = "--sip-module PyQt5.sip"
+fi
+
 download sip "${SIP_VERSION}" "https://files.kde.org/krita/build/dependencies"
-build_pyqt sip "${SIP_VERSION}" "--sip-module PyQt5.sip"
+build_pyqt sip "${SIP_VERSION}" "${SIP_EXTRAFLAGS}"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # pyqt5
diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
index a3dca56..943a6e8 100755
--- a/bootstrap-plugins.sh
+++ b/bootstrap-plugins.sh
@@ -136,7 +136,16 @@ build_waf lilv "${LILV_VERSION}" "--static --no-bash-completion --no-bindings --
 # ---------------------------------------------------------------------------------------------------------------------
 # lv2lint
 
-if [ "${MACOS_OLD}" -eq 0 ] && [ "${CROSS_COMPILING}" -eq 0 ]; then
+LV2LINT_SUPPORTED="true"
+
+if [ "${MACOS_OLD}" -eq 1 ] || [ "${CROSS_COMPILING}" -eq 1 ]; then
+    LV2LINT_SUPPORTED="false"
+fi
+if [ "${MACOS}" -eq 1 ] && [ "$(uname -r)" = "12.6.0" ]; then
+    LV2LINT_SUPPORTED="false"
+fi
+
+if [ "${LV2LINT_SUPPORTED}" = "true" ]; then
     download lv2lint "${LV2LINT_VERSION}" "https://gitlab.com/OpenMusicKontrollers/lv2lint/-/archive/${LV2LINT_VERSION}"
     build_meson lv2lint "${LV2LINT_VERSION}"
     # "-Donline-tests=true -Delf-tests=true"
@@ -186,7 +195,7 @@ build_autoconf mxml ${MXML_VERSION}
 
 if [ "${MACOS}" -eq 0 ]; then
     download zlib ${ZLIB_VERSION} "https://github.com/madler/zlib/archive"
-    build_conf zlib ${ZLIB_VERSION} "--static --prefix='${PAWPAW_PREFIX}'"
+    build_conf zlib ${ZLIB_VERSION} "--static --prefix=${PAWPAW_PREFIX}"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------