diff --git a/Makefile b/Makefile
index af00402..76ed061 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ endif
 
 ### Generic flags
 SRCS=		spectre_v1 spectre_v2
-CFLAGS+=	-march=native
+CFLAGS+=	-march=native -g
 CFLAGS+=	-W
 CFLAGS+=	-Wall
 CFLAGS+=	-Werror -Wextra
@@ -43,12 +43,11 @@ CFLAGS+=	-Wno-unused-parameter
 CFLAGS+=	-Wno-missing-field-initializers
 
 # Fixes segfaults on clang's O2 O3 and gcc's O1 O2
-CFLAGS+=	-fno-inline-functions -fno-inline-small-functions
+CFLAGS+=	-fno-inline-functions 
 
 ### Octopus flags
 CCS=		clang $(GCC)
 OPTIMIZATIONS=	0 1 2 3 fast s
-RETPOLINE= 	mretpoline
 UUID:=		$(shell uuid 2> /dev/null || uuidgen 2> /dev/null || ./uuid)
 RESULTS_FILE:=	results-$(UUID).json
 SSH_KEY=	octoupload
@@ -103,8 +102,8 @@ LPROGS=		$(addsuffix -fence, $(filter spectre_v1%, $(OPROGS)))
 LSPROGS=	$(addsuffix -fence, $(filter spectre_v1%, $(SPROGS)))
 
 ### Masking + Lfence mitigations
-MLPROGS=	$(addsuffix -maskfence, $(filter spectre_v1%, $(OPROGS)))
-MLSPROGS=	$(addsuffix -maskfence, $(filter spectre_v1%, $(SPROGS)))
+#MLPROGS=	$(addsuffix -maskfence, $(filter spectre_v1%, $(OPROGS)))
+#MLSPROGS=	$(addsuffix -maskfence, $(filter spectre_v1%, $(SPROGS)))
 
 ###### V2
 ### Retpoline
@@ -211,13 +210,13 @@ $(LSPROGS):
 	@$(PROGRESS) $(SUB_TWO) $(addprefix -, $(SUB_FOUR)) $(CFLAGS) -DLFENCE_MITIGATION -$(SUB_THREE)  -o $@ $(SUB_ONE).c
 	$(SUB_TWO) $(addprefix -, $(SUB_FOUR)) $(CFLAGS) -DLFENCE_MITIGATION -$(SUB_THREE)  -o $@ $(SUB_ONE).c
 
-$(MLPROGS):
-	@$(PROGRESS) $(SUB_TWO) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION $(LDFLAGS) -$(SUB_THREE)  -o $@ $(SUB_ONE).c
-	$(SUB_TWO) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION $(LDFLAGS) -$(SUB_THREE)  -o $@ $(SUB_ONE).c
-
-$(MLSPROGS):
-	@$(PROGRESS) $(SUB_TWO) $(addprefix -, $(SUB_FOUR)) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION -$(SUB_THREE)  -o $@ $(SUB_ONE).c
-	$(SUB_TWO) $(addprefix -, $(SUB_FOUR)) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION -$(SUB_THREE)  -o $@ $(SUB_ONE).c
+#$(MLPROGS):
+#	@$(PROGRESS) $(SUB_TWO) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION $(LDFLAGS) -$(SUB_THREE)  -o $@ $(SUB_ONE).c
+#	$(SUB_TWO) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION $(LDFLAGS) -$(SUB_THREE)  -o $@ $(SUB_ONE).c
+#
+#$(MLSPROGS):
+#	@$(PROGRESS) $(SUB_TWO) $(addprefix -, $(SUB_FOUR)) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION -$(SUB_THREE)  -o $@ $(SUB_ONE).c
+#	$(SUB_TWO) $(addprefix -, $(SUB_FOUR)) $(CFLAGS) -DLFENCE_MITIGATION -DMASKING_MITIGATION -$(SUB_THREE)  -o $@ $(SUB_ONE).c
 
 $(RCPROGS):
 	@$(PROGRESS) $(SUB_TWO) $(CFLAGS) -mretpoline $(LDFLAGS) -z retpolineplt -$(SUB_THREE) -o $@ $(SUB_ONE).c