diff --git a/AMBuildScript b/AMBuildScript
index 8f307627..eb3e5544 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -200,7 +200,7 @@ class SM:
 			else:
 				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
 			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
-			if sdk == 'l4d2':
+			if sdk == 'ep2v' or sdk == 'l4d2':
 				for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
 					link = os.path.join(workFolder, i)
 					target = os.path.join(staticLibs, i)
@@ -268,7 +268,7 @@ class SM:
 		if not noLink:
 			if AMBuild.target['platform'] == 'linux':
 				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
-				if sdk == 'l4d2':
+				if sdk == 'ep2v' or sdk == 'l4d2':
 					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
 					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
 				else:
diff --git a/core/GameConfigs.cpp b/core/GameConfigs.cpp
index 1b994ff4..56920b22 100644
--- a/core/GameConfigs.cpp
+++ b/core/GameConfigs.cpp
@@ -557,7 +557,7 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states)
 						void *handle = dlopen(info.dli_fname, RTLD_NOW);
 						if (handle)
 						{
-#if SOURCE_ENGINE == SE_LEFT4DEAD2
+#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
 							final_addr = g_MemUtils.ResolveSymbol(handle, &s_TempSig.sig[1]);
 #else
 							final_addr = dlsym(handle, &s_TempSig.sig[1]);
diff --git a/extensions/sdktools/vcaller.cpp b/extensions/sdktools/vcaller.cpp
index 73480d27..f525f30a 100644
--- a/extensions/sdktools/vcaller.cpp
+++ b/extensions/sdktools/vcaller.cpp
@@ -129,7 +129,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p
 		{
 			return 0;
 		}
-#if SOURCE_ENGINE == SE_LEFT4DEAD2
+#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
 		s_call_addr = memutils->ResolveSymbol(handle, &sig[1]);
 #else
 		s_call_addr = dlsym(handle, &sig[1]);
diff --git a/gamedata/sdktools.games/game.dod.txt b/gamedata/sdktools.games/game.dod.txt
index bc07b2f3..e56b7f22 100644
--- a/gamedata/sdktools.games/game.dod.txt
+++ b/gamedata/sdktools.games/game.dod.txt
@@ -23,23 +23,23 @@
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"258"
-				"linux"		"259"
+				"windows"	"259"
+				"linux"		"260"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"256"
-				"linux"		"257"
+				"windows"	"257"
+				"linux"		"258"
 			}
 			"Ignite"
 			{
-				"windows"	"201"
-				"linux"		"202"
+				"windows"	"202"
+				"linux"		"203"
 			}
 			"Extinguish"
 			{
-				"windows"	"205"
-				"linux"		"206"
+				"windows"	"206"
+				"linux"		"207"
 			}
 			"Teleport"
 			{
@@ -53,13 +53,13 @@
 			}
 			"GetVelocity"
 			{
-				"windows"	"136"
-				"linux"		"137"
+				"windows"	"137"
+				"linux"		"138"
 			}
 			"EyeAngles"
 			{
-				"windows"	"127"
-				"linux"		"128"
+				"windows"	"128"
+				"linux"		"129"
 			}
 			"AcceptInput"
 			{
@@ -88,8 +88,8 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"249"
-				"linux"		"250"
+				"windows"	"250"
+				"linux"		"251"
 			}
 			"Activate"
 			{
diff --git a/gamedata/sdktools.games/game.tf.txt b/gamedata/sdktools.games/game.tf.txt
index e60bc045..499373f1 100644
--- a/gamedata/sdktools.games/game.tf.txt
+++ b/gamedata/sdktools.games/game.tf.txt
@@ -28,18 +28,18 @@
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"256"
-				"linux"		"257"
+				"windows"	"257"
+				"linux"		"258"
 			}
 			"Ignite"
 			{
-				"windows"	"201"
-				"linux"		"202"
+				"windows"	"202"
+				"linux"		"203"
 			}
 			"Extinguish"
 			{
-				"windows"	"205"
-				"linux"		"206"
+				"windows"	"206"
+				"linux"		"207"
 			}
 			"Teleport"
 			{
@@ -53,13 +53,13 @@
 			}
 			"GetVelocity"
 			{
-				"windows"	"136"
-				"linux"		"137"
+				"windows"	"137"
+				"linux"		"138"
 			}
 			"EyeAngles"
 			{
-				"windows"	"127"
-				"linux"		"128"
+				"windows"	"128"
+				"linux"		"129"
 			}
 			"DispatchKeyValue"
 			{
@@ -88,8 +88,8 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"249"
-				"linux"		"250"
+				"windows"	"250"
+				"linux"		"251"
 			}
 			"Activate"
 			{
diff --git a/gamedata/sm-tf2.games.txt b/gamedata/sm-tf2.games.txt
index abe273ee..359acf9d 100644
--- a/gamedata/sm-tf2.games.txt
+++ b/gamedata/sm-tf2.games.txt
@@ -86,8 +86,8 @@
 		{
 			"ForceRespawn"
 			{
-				"windows"	"312"
-				"linux"		"313"
+				"windows"	"313"
+				"linux"		"314"
 			}
 		}
 	}