diff --git a/dlls/mysqlx/module.cpp b/dlls/mysqlx/module.cpp
index d208ab9a..fc5afc1b 100644
--- a/dlls/mysqlx/module.cpp
+++ b/dlls/mysqlx/module.cpp
@@ -16,7 +16,7 @@ int SetMysqlAffinity(AMX *amx)
 	MF_AmxReRegister(amx, g_BaseSqlNatives, -1);
 	MF_AmxReRegister(amx, g_ThreadSqlNatives, -1);
 
-	return 0;
+	return 1;
 }
 
 void OnAmxxAttach()
@@ -24,7 +24,9 @@ void OnAmxxAttach()
 	MF_AddNatives(g_BaseSqlNatives);
 	MF_AddNatives(g_ThreadSqlNatives);
 	g_MysqlFuncs.prev = (SqlFunctions *)MF_RegisterFunctionEx(&g_MysqlFuncs, SQL_DRIVER_FUNC);
-	if (!MF_RequestFunction("GetDbDriver") && !MF_FindLibrary("SQLITE", LibType_Library))
+	if (!MF_RequestFunction("GetDbDriver") 
+		&& !MF_FindLibrary("SQLITE", LibType_Library)
+		&& !MF_FindLibrary("sqlitex", LibType_Library))
 	{
 		MF_AddNatives(g_OldCompatNatives);
 		MF_AddLibraries("dbi", LibType_Class, &g_ident);
diff --git a/dlls/mysqlx/sdk/amxxmodule.cpp b/dlls/mysqlx/sdk/amxxmodule.cpp
index 3492febb..b83c9903 100755
--- a/dlls/mysqlx/sdk/amxxmodule.cpp
+++ b/dlls/mysqlx/sdk/amxxmodule.cpp
@@ -2779,7 +2779,7 @@ void ValidateMacros_DontCallThis_Smiley()
 	MF_FindLibrary(NULL, LibType_Class);
 	MF_AddLibraries(NULL, LibType_Class, NULL);
 	MF_RemoveLibraries(NULL);
-	MF_OverrideNatives(NULL);
+	MF_OverrideNatives(NULL, NULL);
 }
 #endif
 
diff --git a/dlls/mysqlx/sdk/amxxmodule.h b/dlls/mysqlx/sdk/amxxmodule.h
index e74febf4..aec781f1 100755
--- a/dlls/mysqlx/sdk/amxxmodule.h
+++ b/dlls/mysqlx/sdk/amxxmodule.h
@@ -2179,7 +2179,7 @@ typedef void			(*PFN_UNREG_AUTH_FUNC)			(AUTHORIZEFUNC);
 typedef int				(*PFN_FINDLIBRARY)				(const char * /*name*/, LibType /*type*/);
 typedef size_t			(*PFN_ADDLIBRARIES)				(const char * /*name*/, LibType /*type*/, void * /*parent*/);
 typedef size_t			(*PFN_REMOVELIBRARIES)			(void * /*parent*/);
-typedef void			(*PFN_OVERRIDENATIVES)			(AMX_NATIVE_INFO * /*natives*/);
+typedef void			(*PFN_OVERRIDENATIVES)			(AMX_NATIVE_INFO * /*natives*/, const char * /*myname*/);
 typedef const char *	(*PFN_GETLOCALINFO)				(const char * /*name*/, const char * /*def*/);
 typedef int				(*PFN_AMX_REREGISTER)			(AMX * /*amx*/, AMX_NATIVE_INFO * /*list*/, int /*list*/);
 typedef void *			(*PFN_REGISTERFUNCTIONEX)		(void * /*pfn*/, const char * /*desc*/);
@@ -2324,7 +2324,7 @@ void			MF_UnregAuthFunc			(AUTHORIZEFUNC fn) { }
 int				MF_FindLibrary				(const char *name, LibType type) { }
 size_t			MF_AddLibraries				(const char *name, LibType type, void *parent) { }
 size_t			MF_RemoveLibraries			(void *parent) { }
-void			MF_OverrideNatives			(AMX_NATIVE_INFO *natives) { }
+void			MF_OverrideNatives			(AMX_NATIVE_INFO *natives, const char *myname) { }
 const char *	MF_GetLocalInfo				(const char *name, const char *def) { }
 int				MF_AmxReRegister			(AMX *amx, AMX_NATIVE_INFO *list, int number) { return 0; }
 void *			MF_RegisterFunctionEx		(void *pfn, const char *description) { }