diff --git a/arch/i386/linker.ld b/arch/i386/linker.ld
index a210d4d..2b7963a 100755
--- a/arch/i386/linker.ld
+++ b/arch/i386/linker.ld
@@ -1,4 +1,4 @@
-OUTPUT_FORMAT("binary")
+OUTPUT_FORMAT("elf32-i386")
 ENTRY(start)
 phys = 0x00100000;
 SECTIONS
diff --git a/include/kernel/tty.h b/include/kernel/tty.h
index f9aab15..8958601 100644
--- a/include/kernel/tty.h
+++ b/include/kernel/tty.h
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "vga.h"
+#include "arch/i386/vga.h"
 
 struct csi_sequence {
 	const char* parameter;
diff --git a/makefile b/makefile
index f0ecd6a..92b8a5e 100755
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@ DEFAULT_HOST:=i686-elf
 HOST?=DEFAULT_HOST
 HOSTARCH:=i386
 
-CFLAGS?= -O2 -g -m32 -no-pie -fno-stack-protector -Wl,--build-id=none
+CFLAGS?= -O2 -g -m32 -fno-pie -fno-stack-protector -Wl,--build-id=none
 CPPFLAGS?=
 LDFLAGS?=
 LIBS?=