diff --git a/kernel/GNUmakefile b/kernel/GNUmakefile
index d2f9d51..27eebd7 100644
--- a/kernel/GNUmakefile
+++ b/kernel/GNUmakefile
@@ -21,7 +21,7 @@ $(eval $(call DEFAULT_VAR,CC,cc))
 $(eval $(call DEFAULT_VAR,LD,ld))
 
 # User controllable CFLAGS.
-CFLAGS ?= -O2 -g -Wall -Wextra -Wpedantic -pipe
+CFLAGS ?= -g -O2 -pipe -Wall -Wextra
 
 # User controllable preprocessor flags. We set none by default.
 CPPFLAGS ?=
@@ -34,11 +34,11 @@ LDFLAGS ?=
 
 # Internal C flags that should not be changed by the user.
 override CFLAGS +=       \
-    -I.                  \
     -std=c11             \
     -ffreestanding       \
     -fno-stack-protector \
     -fno-stack-check     \
+    -fno-lto             \
     -fno-pie             \
     -fno-pic             \
     -m64                 \
@@ -50,12 +50,14 @@ override CFLAGS +=       \
     -mno-sse2            \
     -mno-red-zone        \
     -mcmodel=kernel      \
-    -MMD
+    -MMD                 \
+    -I.
 
 # Internal linker flags that should not be changed by the user.
 override LDFLAGS +=         \
     -nostdlib               \
     -static                 \
+    -m elf_x86_64           \
     -z max-page-size=0x1000 \
     -T linker.ld
 
diff --git a/limine.cfg b/limine.cfg
index 7b4af71..9feac84 100644
--- a/limine.cfg
+++ b/limine.cfg
@@ -3,9 +3,8 @@ TIMEOUT=3
 
 # The entry name that will be displayed in the boot menu
 :Limine Barebones
+    # Change the protocol line depending on the used protocol.
+    PROTOCOL=limine
 
-# Change the protocol line depending on the used protocol.
-PROTOCOL=limine
-
-# Path to the kernel to boot. boot:/// represents the partition on which limine.cfg is located.
-KERNEL_PATH=boot:///kernel.elf
+    # Path to the kernel to boot. boot:/// represents the partition on which limine.cfg is located.
+    KERNEL_PATH=boot:///kernel.elf