diff --git a/src/e820.s b/src/e820.s
index 114de231..59d9c78b 100644
--- a/src/e820.s
+++ b/src/e820.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 # From http://wiki.osdev.org/Detecting_Memory_(x86)#Getting_an_E820_Memory_Map
diff --git a/src/stage_1.s b/src/stage_1.s
index cbab048d..09ada795 100644
--- a/src/stage_1.s
+++ b/src/stage_1.s
@@ -1,6 +1,5 @@
 .section .boot-first-stage, "awx"
 .global _start
-.intel_syntax noprefix
 .code16
 
 # This stage initializes the stack, enables the A20 line, loads the rest of
diff --git a/src/stage_2.s b/src/stage_2.s
index f5ad1141..8cf26ea0 100644
--- a/src/stage_2.s
+++ b/src/stage_2.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 # This stage sets the target operating mode, loads the kernel from disk,
diff --git a/src/stage_3.s b/src/stage_3.s
index 112c68df..2f081afa 100644
--- a/src/stage_3.s
+++ b/src/stage_3.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code32
 
 # This stage performs some checks on the CPU (cpuid, long mode), sets up an
diff --git a/src/video_mode/vga_320x200.s b/src/video_mode/vga_320x200.s
index 17d4a743..6cd20128 100644
--- a/src/video_mode/vga_320x200.s
+++ b/src/video_mode/vga_320x200.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 config_video_mode:
diff --git a/src/video_mode/vga_text_80x25.s b/src/video_mode/vga_text_80x25.s
index 0ddb0d6f..4e65216a 100644
--- a/src/video_mode/vga_text_80x25.s
+++ b/src/video_mode/vga_text_80x25.s
@@ -1,5 +1,4 @@
 .section .boot, "awx"
-.intel_syntax noprefix
 .code16
 
 config_video_mode:
diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json
index ab1c5256..ceb196e9 100644
--- a/x86_64-bootloader.json
+++ b/x86_64-bootloader.json
@@ -16,7 +16,7 @@
     "os": "none",
     "features": "-mmx,-sse,+soft-float",
     "disable-redzone": true,
-    "panic": "abort",
+    "panic-strategy": "abort",
     "executables": true,
-    "relocation_model": "static"
+    "relocation-model": "static"
 }