diff --git a/Kernel/arch/i386/bootstrap/Multiboot/headers/header1.s b/Kernel/arch/i386/bootstrap/Multiboot/headers/header1.s
index bd3cc785..a91af89c 100644
--- a/Kernel/arch/i386/bootstrap/Multiboot/headers/header1.s
+++ b/Kernel/arch/i386/bootstrap/Multiboot/headers/header1.s
@@ -15,13 +15,24 @@
 	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
-.intel_syntax noprefix
-
 .code32
+.extern Multiboot_start
+
 .section .multiboot, "a"
 .align 4
 
 MULTIBOOT_HEADER:
 	.long 0x1BADB002
-	.long 1 << 0 | 1 << 1
-	.long -(0x1BADB002 + (1 << 0 | 1 << 1))
+	.long 0x1 | 0x2 | 0x4
+	.long -(0x1BADB002 + (0x1 | 0x2 | 0x4))
+	/* KLUDGE */
+	.long 0
+	.long 0
+	.long 0
+	.long 0
+	.long 0
+	/* VIDEO MODE */
+	.long 0
+	.long 0
+	.long 0
+	.long 0
diff --git a/Kernel/arch/i386/bootstrap/Multiboot/headers/header2.s b/Kernel/arch/i386/bootstrap/Multiboot/headers/header2.s
index a50e6224..f81e8e34 100644
--- a/Kernel/arch/i386/bootstrap/Multiboot/headers/header2.s
+++ b/Kernel/arch/i386/bootstrap/Multiboot/headers/header2.s
@@ -15,8 +15,6 @@
 	along with Fennix Kernel. If not, see <https://www.gnu.org/licenses/>.
 */
 
-.intel_syntax noprefix
-
 .code32
 .extern Multiboot_start
 
@@ -91,3 +89,4 @@ EndTag_Start:
 	.long EndTag_End - EndTag_Start
 EndTag_End:
 MULTIBOOT2_HEADER_END:
+	nop
diff --git a/Kernel/kernel.cpp b/Kernel/kernel.cpp
index 82f24029..373a427f 100644
--- a/Kernel/kernel.cpp
+++ b/Kernel/kernel.cpp
@@ -365,8 +365,12 @@ EXTERNC __no_stack_protector NIF void Entry(BootInfo *Info)
 	 * memory management to be initialized first.
 	 */
 	TestMemoryAllocation();
+#if defined(__amd64__)
 	Test_stl();
+#else
+#warning "FIXME: Test_stl() is not implemented for other architectures"
 #endif
+#endif // DEBUG
 	EnableProfiler = true;
 	Main();
 }