diff --git a/deps/GMP/0001-GMP_GCC15.patch b/deps/GMP/0001-GMP_GCC15.patch
index e005120acd..fdabed26f7 100644
--- a/deps/GMP/0001-GMP_GCC15.patch
+++ b/deps/GMP/0001-GMP_GCC15.patch
@@ -5,7 +5,7 @@
  #if defined (__GNUC__) && ! defined (__cplusplus)
  typedef unsigned long long t1;typedef t1*t2;
 -void g(){}
-+void g(int,t1 const*,t1,t2,t1 const*,int){}
++void g(int a,t1 const*b,t1 c,t2 dd,t1 const*e,int ff){}
  void h(){}
  static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
  {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
@@ -17,7 +17,7 @@
  #if defined (__GNUC__) && ! defined (__cplusplus)
  typedef unsigned long long t1;typedef t1*t2;
 -void g(){}
-+void g(int,t1 const*,t1,t2,t1 const*,int){}
++void g(int a,t1 const*b,t1 c,t2 dd,t1 const*e,int ff){}
  void h(){}
  static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
  {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
@@ -26,7 +26,7 @@
  #if defined (__GNUC__) && ! defined (__cplusplus)
  typedef unsigned long long t1;typedef t1*t2;
 -void g(){}
-+void g(int,t1 const*,t1,t2,t1 const*,int){}
++void g(int a,t1 const*b,t1 c,t2 dd,t1 const*e,int ff){}
  void h(){}
  static __inline__ t1 e(t2 rp,t2 up,int n,t1 v0)
  {t1 c,x,r;int i;if(v0){c=1;for(i=1;i<n;i++){x=up[i];r=x+1;rp[i]=r;}}return c;}
diff --git a/deps/TBB/TBB.cmake b/deps/TBB/TBB.cmake
index dac2ed63e6..ce3bfd9377 100644
--- a/deps/TBB/TBB.cmake
+++ b/deps/TBB/TBB.cmake
@@ -15,6 +15,7 @@ orcaslicer_add_cmake_project(
         -DTBB_BUILD_SHARED=OFF
         -DTBB_BUILD_TESTS=OFF
         -DTBB_TEST=OFF
+        -DTBB_DISABLE_HWLOC_AUTOMATIC_SEARCH=ON
         -DTBB_ENABLE_IPO=OFF
         -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
         -DCMAKE_POSITION_INDEPENDENT_CODE=ON
diff --git a/scripts/linux.d/debian b/scripts/linux.d/debian
index c33b24d2b7..e5816d345e 100644
--- a/scripts/linux.d/debian
+++ b/scripts/linux.d/debian
@@ -2,6 +2,7 @@
 
 REQUIRED_DEV_PACKAGES=(
     autoconf
+    automake
     build-essential
     cmake
     eglexternalplatform-dev
@@ -50,16 +51,20 @@ then
         REQUIRED_DEV_PACKAGES+=(libssl-dev libcurl4-openssl-dev)
     fi
 
-    # check which version of libwebkit2gtk is available
-    if [ "$(apt show --quiet libwebkit2gtk-4.0-dev 2>/dev/null)" != "" ]
+    # The package lists must be current before checking what is available.
+    sudo apt update
+
+    # src/slic3r/CMakeLists.txt requires webkit2gtk-4.1 unconditionally (no
+    # 4.0 fallback), so prefer it; only fall back to 4.0-dev when 4.1 isn't
+    # packaged for this distro.
+    if [ "$(apt show --quiet libwebkit2gtk-4.1-dev 2>/dev/null)" != "" ]
     then
-        REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.0-dev)
-    else
         REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev)
+    else
+        REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.0-dev)
     fi
 
     # install them all at once
-    sudo apt update
     sudo apt install -y "${REQUIRED_DEV_PACKAGES[@]}"
 
     echo -e "done\n"