--- src/kernel/sel4/configs/pc99/autoconf.h
+++ src/kernel/sel4/configs/pc99/autoconf.h
@@ -24,7 +24,8 @@
 #define CONFIG_HAVE_LIBC 1
 #define CONFIG_USER_COMPILER ""
 #define CONFIG_LIB_SEL4_PLAT_SUPPORT 1
-#define CONFIG_WORD_SIZE 64
+#define CONFIG_WORD_SIZE 32
+#define CONFIG_ARCH_X86_GENERIC 1
 #define CONFIG_ARCH_X86 1
 #define CONFIG_APP_TESTS 1
 #define CONFIG_MAX_NUM_IOAPIC 1
@@ -32,15 +32,14 @@
 #define CONFIG_SEL4UTILS_STACK_SIZE 655360
 #define CONFIG_HAVE_LIB_SEL4_ALLOCMAN 1
 #define CONFIG_FASTPATH 1
-#define CONFIG_X2APIC 1
 #define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_OBJS_SZ 0
-#define CONFIG_HAVE_TIMER 1
 #define CONFIG_SEL4UTILS_CSPACE_SIZE_BITS 18
 #define CONFIG_DOMAIN_SCHEDULE ""
 #define CONFIG_LIB_SEL4 1
 #define CONFIG_LIBSEL4DEBUG_FUNCTION_INSTRUMENTATION_NONE 1
 #define CONFIG_LIB_SEL4_UTILS 1
 #define CONFIG_LIB_SEL4_VSPACE 1
+#define CONFIG_PRINTING 1
 #define CONFIG_LIB_PLATSUPPORT 1
 #define CONFIG_LIB_SEL4_ALLOCMAN 1
 #define CONFIG_HAVE_LIB_SEL4_SIMPLE_DEFAULT 1
@@ -49,7 +48,6 @@
 #define CONFIG_HAVE_LIB_SEL4_VSPACE 1
 #define CONFIG_MAX_NUM_BOOTINFO_UNTYPED_CAPS 230
 #define CONFIG_LIB_SEL4_VKA_DEBUG_LIVE_SLOTS_SZ 0
-#define CONFIG_SYSCALL 1
 #define CONFIG_MAX_NUM_NODES 1
 #define CONFIG_CROSS_COMPILER_PREFIX ""
 #define CONFIG_MAX_RMRR_ENTRIES 32
@@ -66,7 +64,9 @@
 #define CONFIG_OPTIMISATION_O2 1
 #define CONFIG_HAVE_LIB_CPIO 1
 #define CONFIG_HAVE_LIB_SEL4_VKA 1
-#define CONFIG_FSGSBASE_INST 1
+#define CONFIG_XAPIC 1
+#define CONFIG_SYSENTER 1
+#define CONFIG_FSGSBASE_GDT 1
 #define CONFIG_HAVE_LIB_SEL4_PLAT_SUPPORT 1
 #define CONFIG_USER_EXTRA_CFLAGS "-D_XOPEN_SOURCE=700"
 #define CONFIG_HAVE_FPU 1
@@ -76,6 +76,7 @@
 #define CONFIG_SUPPORT_PCID 1
 #define CONFIG_HAVE_LIB_PLATSUPPORT 1
 #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
@@ -92,9 +93,6 @@
 #define CONFIG_KERNEL_EXTRA_CPPFLAGS ""
 #define CONFIG_LIBSEL4DEBUG_ALLOC_BUFFER_ENTRIES 128
 #define CONFIG_CACHE_LN_SZ 64
-#define CONFIG_ARCH_X86_64 1
 #define CONFIG_HUGE_PAGE 1
 #define CONFIG_LIB_SEL4_MUSLC_SYS_MORECORE_BYTES 1048576
 #define CONFIG_BUILDSYS_USE_CCACHE 1
-#define CONFIG_MAX_NUM_NODES 1
-#define CONFIG_KERNEL_STACK_BITS 12