diff --git a/amxmodx/msvc7/amxmodx_mm.vcproj b/amxmodx/msvc7/amxmodx_mm.vcproj
index 926544df..7d6ff634 100755
--- a/amxmodx/msvc7/amxmodx_mm.vcproj
+++ b/amxmodx/msvc7/amxmodx_mm.vcproj
@@ -487,6 +487,9 @@
 			<File
 				RelativePath="..\vector.cpp">
 			</File>
+			<File
+				RelativePath="..\trie_natives.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -623,6 +626,9 @@
 			<File
 				RelativePath="..\zlib\zlib.h">
 			</File>
+			<File
+				RelativePath="..\trie_natives.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/amxmodx/msvc8/amxmodx_mm.sln b/amxmodx/msvc8/amxmodx_mm.sln
index a7921c18..0ae1e53a 100644
--- a/amxmodx/msvc8/amxmodx_mm.sln
+++ b/amxmodx/msvc8/amxmodx_mm.sln
@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
 EndProject
 Global
diff --git a/amxmodx/msvc8/amxmodx_mm.vcproj b/amxmodx/msvc8/amxmodx_mm.vcproj
index 350b683d..0ce1a403 100644
--- a/amxmodx/msvc8/amxmodx_mm.vcproj
+++ b/amxmodx/msvc8/amxmodx_mm.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="9.00"
 	Name="amxmodx_mm"
 	ProjectGUID="{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}"
 	RootNamespace="amxmodx"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -89,6 +90,8 @@
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitdebug/amxx_mm.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary=".\jitdebug/amxmodx_mm.lib"
 			/>
 			<Tool
@@ -109,9 +112,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -197,6 +197,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb"
 				GenerateMapFile="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary=".\jitrelease/amxmodx_mm.lib"
 			/>
 			<Tool
@@ -217,9 +219,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -299,6 +298,8 @@
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitdebugbinlog/amxmodx_bl_mm.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary=".\jitdebugbinlog/amxmodx_bl_mm.lib"
 			/>
 			<Tool
@@ -319,9 +320,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -406,6 +404,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_bl_mm.pdb"
 				GenerateMapFile="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				ImportLibrary=".\jitreleasebinlog/amxmodx_bl_mm.lib"
 			/>
 			<Tool
@@ -426,9 +426,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -657,6 +654,10 @@
 				RelativePath="..\strptime.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\trie_natives.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\util.cpp"
 				>
@@ -842,6 +843,10 @@
 				RelativePath="..\svn_version.h"
 				>
 			</File>
+			<File
+				RelativePath="..\trie_natives.h"
+				>
+			</File>
 			<File
 				RelativePath="..\zlib\zconf.h"
 				>