diff --git a/AMBuildScript b/AMBuildScript
index 56faedafb..93a6cbd7e 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -525,7 +525,7 @@ class SMConfig(object):
     for other_sdk in self.sdk_manifests:
       compiler.defines += ['SE_{}={}'.format(other_sdk['define'], other_sdk['code'])]
 
-    SdkHelpers.configureCxx(context, binary, sdk)
+    SdkHelpers.configureCxx(context, binary.compiler, sdk)
 
     return binary
 
diff --git a/core/vprof_tool.cpp b/core/vprof_tool.cpp
index 110025ec6..6f24999d9 100644
--- a/core/vprof_tool.cpp
+++ b/core/vprof_tool.cpp
@@ -30,8 +30,12 @@
 #include "sourcemod.h"
 #include "sourcemm_api.h"
 
+#ifndef VPROF_ENABLED
 #define VPROF_ENABLED
+#endif
+#ifndef RAD_TELEMETRY_DISABLED
 #define RAD_TELEMETRY_DISABLED
+#endif
 #include <tier0/vprof.h>
 
 VProfTool sVProfTool;
diff --git a/hl2sdk-manifests b/hl2sdk-manifests
index 38b4f3670..d7c14e375 160000
--- a/hl2sdk-manifests
+++ b/hl2sdk-manifests
@@ -1 +1 @@
-Subproject commit 38b4f3670826bbfe7c536ef33ec53f5971d419e2
+Subproject commit d7c14e375f2a763d8429ad4350d0d3dcdfcd57b4