diff --git a/AMBuildScript b/AMBuildScript
index 9dd25828..0dbcf335 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -496,7 +496,7 @@ class SMConfig(object):
           '-current_version', self.productVersion
         ]
     if self.use_auto_versioning():
-      binary.compiler.linkflags += [self.versionlib[binary.compiler.target.arch]]
+      binary.compiler.postlink += [self.versionlib[binary.compiler.target.arch]]
       binary.compiler.sourcedeps += SM.generated_headers
     return binary
     
diff --git a/core/HalfLife2.cpp b/core/HalfLife2.cpp
index aba2c2ed..2b62c63b 100644
--- a/core/HalfLife2.cpp
+++ b/core/HalfLife2.cpp
@@ -1234,7 +1234,7 @@ bool IsWindowsReservedDeviceName(const char *pMapname)
 }
 #endif 
 
-#if SOURCE_ENGINE >= SE_LEFT4DEAD && defined PLATFORM_WINDOWS
+#if SOURCE_ENGINE >= SE_LEFT4DEAD && defined PLATFORM_WINDOWS && SOURCE_ENGINE != SE_MOCK
 // This frees memory allocated by the game using the game's CRT on Windows,
 // avoiding a crash due to heap corruption (issue #910).
 template< class T, class I >
diff --git a/core/HalfLife2.h b/core/HalfLife2.h
index 86860468..0b6b4449 100644
--- a/core/HalfLife2.h
+++ b/core/HalfLife2.h
@@ -235,7 +235,7 @@ public: //IGameHelpers
 	bool IsMapValid(const char *map);
 	SMFindMapResult FindMap(char *pMapName, size_t nMapNameMax);
 	SMFindMapResult FindMap(const char *pMapName, char *pFoundMap = NULL, size_t nMapNameMax = 0);
-#if SOURCE_ENGINE >= SE_LEFT4DEAD && defined PLATFORM_WINDOWS
+#if SOURCE_ENGINE >= SE_LEFT4DEAD && defined PLATFORM_WINDOWS && SOURCE_ENGINE != SE_MOCK
 	void FreeUtlVectorUtlString(CUtlVector<CUtlString, CUtlMemoryGlobalMalloc<CUtlString>> &vec);
 #endif
 	bool GetMapDisplayName(const char *pMapName, char *pDisplayname, size_t nMapNameMax);
diff --git a/sourcepawn b/sourcepawn
index 385d304e..fa72b5ed 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 385d304ea81f1a2484b9638b275387b1e10efce2
+Subproject commit fa72b5ed2ace4022264a8de83695246256f8b939