--- src/kernel/sel4/configs/pc99/autoconf.h
+++ src/kernel/sel4/configs/pc99/autoconf.h
@@ -51,13 +51,13 @@
 #define CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS 167
 #define CONFIG_FPU_MAX_RESTORES_SINCE_SWITCH 64
 #define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_SLOTS_SZ 0
-#define CONFIG_MAX_NUM_NODES 1
+#define CONFIG_MAX_NUM_NODES 16
 #define CONFIG_CROSS_COMPILER_PREFIX ""
 #define CONFIG_LIB_SEL4_INLINE_INVOCATIONS 1
 #define CONFIG_LIB_SEL4_MUSLC_SYS 1
 #define CONFIG_HAVE_LIB_SEL4_TEST 1
 #define CONFIG_LIB_MUSL_C 1
-#define CONFIG_ARCH_X86_NEHALEM 1
+#define CONFIG_ARCH_X86_GENERIC 1
 #define CONFIG_MAX_NUM_WORK_UNITS_PER_PREEMPTION 100
 #define CONFIG_USER_CFLAGS ""
 #define CONFIG_HAVE_LIB_SEL4_DEBUG 1
@@ -75,13 +75,13 @@
 #define CONFIG_HAVE_LIB_SEL4_SIMPLE 1
 #define CONFIG_HAVE_LIB_ELF 1
 #define CONFIG_HAVE_LIB_PLATSUPPORT 1
-#define CONFIG_NUM_DOMAINS 16
+#define CONFIG_NUM_DOMAINS 1
 #define CONFIG_ARCH_IA32 1
 #define CONFIG_HAVE_LIB_UTILS 1
 #define CONFIG_USER_OPTIMISATION_O2 1
 #define CONFIG_LIB_CPIO 1
 #define CONFIG_RETYPE_FAN_OUT_LIMIT 256
-#define CONFIG_ROOT_CNODE_SIZE_BITS 16
+#define CONFIG_ROOT_CNODE_SIZE_BITS 18
 #define CONFIG_NUM_PRIORITIES 256
 #define CONFIG_TESTPRINTER_REGEX ".*"
 #define CONFIG_APP_SEL4TEST 1
@@ -96,6 +96,11 @@
 #define CONFIG_CACHE_LN_SZ 64
 #define CONFIG_LIB_SEL4_MUSLC_SYS_MORECORE_BYTES 1048576
 #define CONFIG_BUILDSYS_USE_CCACHE 1
+#define CONFIG_MULTIBOOT1_HEADER
+#define CONFIG_MULTIBOOT2_HEADER
+#define CONFIG_PRINTING 1
+#define CONFIG_ENABLE_BENCHMARKS 1
+#define CONFIG_BENCHMARK_TRACK_UTILISATION 1
 #else
 #define AUTOCONF_INCLUDED
 #define CONFIG_LIB_SEL4_SIMPLE 1