diff --git a/Runtime/Graphics/Shaders/CPhazonSuitFilterGLSL.cpp b/Runtime/Graphics/Shaders/CPhazonSuitFilterGLSL.cpp
index 38ba01299..8a0d2ce43 100644
--- a/Runtime/Graphics/Shaders/CPhazonSuitFilterGLSL.cpp
+++ b/Runtime/Graphics/Shaders/CPhazonSuitFilterGLSL.cpp
@@ -92,7 +92,7 @@ static const char* BlurVS =
 "#version 330\n"
 BOO_GLSL_BINDING_HEAD
 "layout(location=0) in vec4 posIn;\n"
-"layout(location=3) in vec4 uvIn;\n"
+"layout(location=1) in vec4 uvIn;\n"
 "\n"
 "UBINDING0 uniform PhazonSuitBlurUniform\n"
 "{\n"
diff --git a/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp b/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp
index cf796fe0a..33c6150be 100644
--- a/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp
+++ b/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp
@@ -126,7 +126,7 @@ CRadarPaintShader::Initialize(boo::VulkanDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::UV4, 3},
         {nullptr, nullptr, boo::VertexSemantic::Color}
     };
-    s_VtxFmt = ctx.newVertexFormat(2, VtxVmt);
+    s_VtxFmt = ctx.newVertexFormat(9, VtxVmt);
     s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                        boo::BlendFactor::One, boo::Primitive::TriStrips,
                                        boo::ZTest::None, false, true, false, boo::CullMode::None);
diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp
index a5eb3f619..3da1ef698 100644
--- a/Runtime/Input/CInputGenerator.hpp
+++ b/Runtime/Input/CInputGenerator.hpp
@@ -179,7 +179,8 @@ public:
         if (!smashAdapter)
         {
             smashAdapter = std::dynamic_pointer_cast<boo::DolphinSmashAdapter>(tok.openAndGetDevice());
-            smashAdapter->setCallback(&m_dolphinCb);
+            if (smashAdapter)
+                smashAdapter->setCallback(&m_dolphinCb);
         }
     }
     void deviceDisconnected(boo::DeviceToken&, boo::DeviceBase* device)
diff --git a/Runtime/MP1/World/CActorContraption.cpp b/Runtime/MP1/World/CActorContraption.cpp
index 39bbd26d0..3235480cb 100644
--- a/Runtime/MP1/World/CActorContraption.cpp
+++ b/Runtime/MP1/World/CActorContraption.cpp
@@ -36,7 +36,7 @@ void MP1::CActorContraption::Think(float dt, CStateManager& mgr)
 
         if (act && act->GetActive())
         {
-            act->SetTransform(act->GetScaledLocatorTransform(uid.second));
+            act->SetTransform(x34_transform * act->GetScaledLocatorTransform(uid.second));
         }
     }
 }
diff --git a/hecl b/hecl
index 104d554f4..b25f7f300 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 104d554f42102390ddcc52fe50832097b78c6c08
+Subproject commit b25f7f30026b51ae5f3025efbade3d88c933dbe0