diff --git a/amxmodx/CPlugin.cpp b/amxmodx/CPlugin.cpp
index 495cb9fd..0d7851d4 100755
--- a/amxmodx/CPlugin.cpp
+++ b/amxmodx/CPlugin.cpp
@@ -288,7 +288,7 @@ static cell AMX_NATIVE_CALL invalid_native(AMX *amx, cell *params)
 	}
 
 	char name[sNAMEMAX + 1];
-	int native = reinterpret_cast<int>(amx->usertags[UT_NATIVE]);
+	int native = (int)(amx->usertags[UT_NATIVE]);
 	int err = amx_GetNative(amx, native, name);
 
 	if (err != AMX_ERR_NONE)
diff --git a/amxmodx/Makefile b/amxmodx/Makefile
index c921b3bd..4364b609 100755
--- a/amxmodx/Makefile
+++ b/amxmodx/Makefile
@@ -18,7 +18,7 @@ OBJECTS = meta_api.cpp CFile.cpp CVault.cpp vault.cpp float.cpp file.cpp modules
 	CMenu.cpp util.cpp amx.cpp amxdbg.cpp natives.cpp newmenus.cpp debugger.cpp \
 	optimizer.cpp
 
-LINK = -lz 
+LINK = -lz /lib/libstdc++.a
 
 INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
 	-I$(MM_ROOT) -Lzlib -I$(HLSDK)/common
@@ -40,7 +40,7 @@ CFLAGS += -DLINUX -DNDEBUG -fPIC -Wno-deprecated -DHAVE_STDINT_H -static-libgcc
 
 ifeq "$(AMD64)" "true"
 	BINARY = $(NAME)_amd64.so
-	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -m64 
+	CFLAGS += -DPAWN_CELL_SIZE=64 -DHAVE_I64 -DAMD64 -m64 
 	OBJECTS += JIT/natives-amd64.o
 else
 	BINARY = $(NAME)_i386.so