diff --git a/.gitignore b/.gitignore
index 9b41816..f3cbd9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,11 @@ mOS
 # Emacs
 *.~
 
+# Nix
+.envrc
+.lock
+.nix
+
 # Powershell (b/c qemu's fussy)
 *.ps1
 
diff --git a/Makefile b/Makefile
index 7c5585d..da13c8d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,12 @@ GDB := gdb
 endif
 
 ifeq ($(DEBUG), true)
-DEBUG_CFLAGS := -g3 -O0
+DEBUG_CFLAGS := -g3 -O0 -fno-stack-protector
 DEBUG_NASM_FLAGS := -O0
 DEBUG_QEMU_FLAGS := -monitor stdio
 DEBUG_LFLAGS := -g
 else
-DEBUG_CFLAGS := -Os
+DEBUG_CFLAGS := -Os -fno-stack-protector
 DEBUG_NASM_FLAGS := -Ox
 DEBUG_QEMU_FLAGS :=
 DEBUG_LFLAGS :=