diff --git a/amxmodx/Makefile b/amxmodx/Makefile
index 682c9b16..82988d3b 100755
--- a/amxmodx/Makefile
+++ b/amxmodx/Makefile
@@ -45,6 +45,7 @@ ifeq "$(AMD64)" "true"
 else
 	BINARY = $(NAME)_i386.so
 	OBJECTS += JIT/amxexecn.o JIT/amxjitsn.o JIT/natives-x86.o
+	OBJECTS += JIT/helpers-x86.o
 	CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32
 	OPT_FLAGS += -march=i586
 endif
diff --git a/amxmodx/optimizer.cpp b/amxmodx/optimizer.cpp
index 4e5b1f48..d80a84ec 100644
--- a/amxmodx/optimizer.cpp
+++ b/amxmodx/optimizer.cpp
@@ -99,12 +99,16 @@ void _Setup_Optimizer_Stage2(AMX *amx, cell *oplist, cell *cip)
 	}
 	if (g_opt_level & 2)
 	{
+#if !defined AMD64
 		if (amxx_CpuSupport())
 		{
+#endif
 			FIND_NATIVE("floatcmp", N_Float_Cmp);
+#if !defined AMD64
 		} else {
 			g_opt_level &= ~(2);
 		}
+#endif
 	}
 	//we don't do these yet because of radix stuff >:\
 	//FIND_NATIVE("floatsin", N_Float_Sin);