diff --git a/dlls/mysqlx/Makefile b/dlls/mysqlx/Makefile
index 32ebbd39..1702a1c0 100755
--- a/dlls/mysqlx/Makefile
+++ b/dlls/mysqlx/Makefile
@@ -8,7 +8,7 @@ MM_ROOT = ../../metamod/metamod
 
 OPT_FLAGS = -O2 -funroll-loops -s -pipe -fomit-frame-pointer -fno-strict-aliasing
 DEBUG_FLAGS = -g -ggdb3
-CPP = gcc-4.1
+CPP = gcc-3.4
 NAME = mysql
 #MYSQL_DIR = ../../../mysql-5.0.22
 MYSQL_DIR = ../../../mysql-5.0
@@ -20,7 +20,7 @@ OBJECTS = basic_sql.cpp handles.cpp module.cpp threading.cpp sdk/amxxmodule.cpp
 OBJECTS += thread/BaseWorker.cpp thread/ThreadWorker.cpp thread/PosixThreads.cpp
 OBJECTS += mysql/MysqlQuery.cpp mysql/MysqlResultSet.cpp mysql/MysqlDatabase.cpp mysql/MysqlDriver.cpp 
 
-LINK = -static-libgcc -lmysqlclient_r -lz -lpthread /lib/libgcc_eh.a /lib/libstdc++.a
+LINK = -lgcc -static-libgcc -lmysqlclient_r -lz -lpthread
 
 INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \
 	-I$(MM_ROOT) -I$(HLSDK)/common -I$(MYSQL_DIR)/include -L$(MYSQL_DIR)/lib -Ithread \
diff --git a/dlls/mysqlx/module.cpp b/dlls/mysqlx/module.cpp
index f96bcae8..aaa31175 100644
--- a/dlls/mysqlx/module.cpp
+++ b/dlls/mysqlx/module.cpp
@@ -45,3 +45,7 @@ void OnPluginsUnloaded()
 	FreeAllHandles(Handle_Connection);
 }
 
+extern "C" void __cxa_pure_virtual(void)
+{
+}
+
diff --git a/dlls/mysqlx/threading.cpp b/dlls/mysqlx/threading.cpp
index 5375c6bf..6c39e4e3 100644
--- a/dlls/mysqlx/threading.cpp
+++ b/dlls/mysqlx/threading.cpp
@@ -401,11 +401,6 @@ bool AtomicResult::FieldNameToNum(const char *name, unsigned int *columnId)
 		}
 	}
 
-	if (columnId)
-	{
-		*columnId = -1;
-	}
-
 	return false;
 }