diff --git a/DataSpec/DNAMP1/DeafBabe.hpp b/DataSpec/DNAMP1/DeafBabe.hpp
index b5dd88129..b7282d82c 100644
--- a/DataSpec/DNAMP1/DeafBabe.hpp
+++ b/DataSpec/DNAMP1/DeafBabe.hpp
@@ -18,7 +18,7 @@ struct DeafBabe : BigDNA
         DECL_DNA
         Value<atUint32> material;
         bool unknown() const { return material & 1; }
-        void setUnknown(bool v) { material &= ~1; material |= v; }
+        void setUnknown(bool v) { material &= ~1; material |= int(v); }
         bool surfaceStone() const { return (material >> 1) & 1; }
         void setSurfaceStone(bool v) { material &= ~(1ull << 1); material |= (v << 1); }
         bool surfaceMetal() const { return (material >> 2) & 1; }
diff --git a/DataSpec/DNAMP2/DeafBabe.hpp b/DataSpec/DNAMP2/DeafBabe.hpp
index 78fcda060..ad0a14070 100644
--- a/DataSpec/DNAMP2/DeafBabe.hpp
+++ b/DataSpec/DNAMP2/DeafBabe.hpp
@@ -18,7 +18,7 @@ struct DeafBabe : BigDNA
         DECL_DNA
         Value<atUint64> material;
         bool unknown() const { return material & 1; }
-        void setUnknown(bool v) { material &= ~1; material |= v; }
+        void setUnknown(bool v) { material &= ~1; material |= atUint64(v); }
         bool surfaceStone() const { return (material >> 1ull) & 1; }
         void setSurfaceStone(bool v) { material &= ~(1ull << 1ull); material |= (atUint64(v) << 1ull); }
         bool surfaceMetal() const { return (material >> 2) & 1; }
diff --git a/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp b/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
index c7a7f8e5c..67f1ae237 100644
--- a/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
@@ -76,22 +76,22 @@ CModelShaders::GetShaderExtensionsHLSL(boo::IGraphicsDataFactory::Platform plat)
     hecl::Runtime::ShaderCacheExtensions ext(plat);
 
     /* Normal lit shading */
-    ext.registerExtensionSlot({LightingMetal, "LightingFunc"}, {MainPostMetal, "MainPostFunc"},
+    ext.registerExtensionSlot({LightingHLSL, "LightingFunc"}, {MainPostHLSL, "MainPostFunc"},
                               0, nullptr, 0, nullptr, hecl::Backend::BlendFactor::Original,
                               hecl::Backend::BlendFactor::Original);
 
     /* Thermal Visor shading */
-    ext.registerExtensionSlot({}, {ThermalPostMetal, "ThermalPostFunc"}, 0, nullptr,
+    ext.registerExtensionSlot({}, {ThermalPostHLSL, "ThermalPostFunc"}, 0, nullptr,
                               1, ThermalTextures, hecl::Backend::BlendFactor::One,
                               hecl::Backend::BlendFactor::One);
 
     /* Forced alpha shading */
-    ext.registerExtensionSlot({LightingMetal, "LightingFunc"}, {MainPostMetal, "MainPostFunc"},
+    ext.registerExtensionSlot({LightingHLSL, "LightingFunc"}, {MainPostHLSL, "MainPostFunc"},
                               0, nullptr, 0, nullptr, hecl::Backend::BlendFactor::SrcAlpha,
                               hecl::Backend::BlendFactor::InvSrcAlpha);
 
     /* Forced additive shading */
-    ext.registerExtensionSlot({LightingMetal, "LightingFunc"}, {MainPostMetal, "MainPostFunc"},
+    ext.registerExtensionSlot({LightingHLSL, "LightingFunc"}, {MainPostHLSL, "MainPostFunc"},
                               0, nullptr, 0, nullptr, hecl::Backend::BlendFactor::One,
                               hecl::Backend::BlendFactor::One);
 
diff --git a/Runtime/World/CScriptMemoryRelay.cpp b/Runtime/World/CScriptMemoryRelay.cpp
index 739576a83..fa0c9f6c1 100644
--- a/Runtime/World/CScriptMemoryRelay.cpp
+++ b/Runtime/World/CScriptMemoryRelay.cpp
@@ -9,7 +9,7 @@ namespace urde
 CScriptMemoryRelay::CScriptMemoryRelay(TUniqueId uid, const std::string& name, const CEntityInfo& info, bool b1, bool b2, bool b3)
     : CEntity(uid, info, true, name),
       x34_24_(b1),
-      x34_25_skipSendNone(b2),
+      x34_25_skipSendActive(b2),
       x34_26_ignoreMessages(b3)
 {
 }
@@ -32,7 +32,7 @@ void CScriptMemoryRelay::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId obj
     else if (msg == EScriptObjectMessage::Activate)
     {
         stateMgr.GetRelayTracker()->AddRelay(xc_editorId);
-        if (!x34_25_skipSendNone)
+        if (!x34_25_skipSendActive)
             SendScriptMsgs(EScriptObjectState::Active, stateMgr, EScriptObjectMessage::None);
 
         return;
diff --git a/Runtime/World/CScriptMemoryRelay.hpp b/Runtime/World/CScriptMemoryRelay.hpp
index c722bc24e..edbd08bfd 100644
--- a/Runtime/World/CScriptMemoryRelay.hpp
+++ b/Runtime/World/CScriptMemoryRelay.hpp
@@ -12,7 +12,7 @@ class CScriptMemoryRelay : public CEntity
         struct
         {
             bool x34_24_;
-            bool x34_25_skipSendNone;
+            bool x34_25_skipSendActive;
             bool x34_26_ignoreMessages;
         };
         u8 dummy = 0;