diff --git a/buildbot/worker/blender/compile.py b/buildbot/worker/blender/compile.py
index 5fff990..b551533 100644
--- a/buildbot/worker/blender/compile.py
+++ b/buildbot/worker/blender/compile.py
@@ -533,3 +533,8 @@ def compile_install(builder: worker.blender.CodeBuilder) -> None:
     builder.setup_build_environment()
     cmake_configure(builder)
     cmake_build(builder, True)
+
+    if builder.python_module:
+        wheel_cleanup_tool = builder.blender_dir / "tools" / "utils_build" / "wheel_cleanup.py"
+        if wheel_cleanup_tool.exists():
+            builder.call(("python", wheel_cleanup_tool, builder.install_dir / "bpy"))
diff --git a/buildbot/worker/configure.py b/buildbot/worker/configure.py
index fe9d7d4..87b2092 100644
--- a/buildbot/worker/configure.py
+++ b/buildbot/worker/configure.py
@@ -39,7 +39,7 @@ def disk_free_in_gb(builder: worker.utils.Builder) -> float:
 
 
 def get_thread_count(thread_memory_in_GB: float) -> int:
-    num_threads = psutil.cpu_count()
+    num_threads = psutil.cpu_count() or 1
     memory_in_GB = psutil.virtual_memory().total / (1024**3)
 
     return min(int(memory_in_GB / thread_memory_in_GB), num_threads)