diff --git a/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h b/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
index 3073dfb2d7..946bddd4c7 100644
--- a/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
+++ b/headers/private/kernel/boot/platform/bios_ia32/platform_kernel_args.h
@@ -15,7 +15,7 @@
 
 
 // must match SMP_MAX_CPUS in arch_smp.h
-#define MAX_BOOT_CPUS 4
+#define MAX_BOOT_CPUS 8
 #define MAX_PHYSICAL_MEMORY_RANGE 6
 #define MAX_PHYSICAL_ALLOCATED_RANGE 6
 #define MAX_VIRTUAL_ALLOCATED_RANGE 6
diff --git a/src/system/libroot/posix/malloc/heap.h b/src/system/libroot/posix/malloc/heap.h
index 730c9003d7..9d0c51a6ea 100644
--- a/src/system/libroot/posix/malloc/heap.h
+++ b/src/system/libroot/posix/malloc/heap.h
@@ -61,7 +61,7 @@ class hoardHeap {
 		// number of threads -- Hoard imposes no such limit.)  This must be
 		// a power of two! NB: This number is twice the maximum number of
 		// PROCESSORS supported by Hoard.
-		enum { MAX_HEAPS = B_MAX_CPU_COUNT };
+		enum { MAX_HEAPS = B_MAX_CPU_COUNT * 2 };
 
 		// ANDing with this rounds to MAX_HEAPS.
 		enum { MAX_HEAPS_MASK = MAX_HEAPS - 1 };