diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.cpp b/Runtime/Graphics/Shaders/CWorldShadowShader.cpp
index 329fbbf25..b083a6dde 100644
--- a/Runtime/Graphics/Shaders/CWorldShadowShader.cpp
+++ b/Runtime/Graphics/Shaders/CWorldShadowShader.cpp
@@ -48,7 +48,7 @@ void CWorldShadowShader::blendPreviousShadow()
 
 void CWorldShadowShader::resolveTexture()
 {
-    boo::SWindowRect rect = {0, 0, m_w, m_h};
+    boo::SWindowRect rect = {0, 0, int(m_w), int(m_h)};
     CGraphics::g_BooMainCommandQueue->resolveBindTexture(m_tex, rect, false, 0, true, false);
 }
 
diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp
index b3b163746..1619abacc 100644
--- a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp
+++ b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp
@@ -10,10 +10,10 @@ namespace urde
 
 class CWorldShadowShader
 {
-    friend class CWorldShadowShaderGLDataBindingFactory;
-    friend class CWorldShadowShaderVulkanDataBindingFactory;
-    friend class CWorldShadowShaderD3DDataBindingFactory;
-    friend class CWorldShadowShaderMetalDataBindingFactory;
+    friend struct CWorldShadowShaderGLDataBindingFactory;
+    friend struct CWorldShadowShaderVulkanDataBindingFactory;
+    friend struct CWorldShadowShaderD3DDataBindingFactory;
+    friend struct CWorldShadowShaderMetalDataBindingFactory;
 
     boo::ITextureR* m_tex;
     std::experimental::optional<CTexturedQuadFilter> m_prevQuad;
diff --git a/Runtime/Graphics/Shaders/CWorldShadowShaderHLSL.cpp b/Runtime/Graphics/Shaders/CWorldShadowShaderHLSL.cpp
index 2097e0195..1f24eecc9 100644
--- a/Runtime/Graphics/Shaders/CWorldShadowShaderHLSL.cpp
+++ b/Runtime/Graphics/Shaders/CWorldShadowShaderHLSL.cpp
@@ -55,12 +55,10 @@ struct CWorldShadowShaderD3DDataBindingFactory : TShader<CWorldShadowShader>::ID
         boo::ID3DDataFactory::Context& cctx = static_cast<boo::ID3DDataFactory::Context&>(ctx);
 
         boo::IGraphicsBuffer* bufs[] = {filter.m_uniBuf};
-        filter.m_dataBind = cctx.newShaderDataBinding(s_Pipeline,
-            nullptr, nullptr, nullptr, s_VtxFmt,
+        filter.m_dataBind = cctx.newShaderDataBinding(s_Pipeline, s_VtxFmt,
             filter.m_vbo, nullptr, nullptr, 1, bufs,
             nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr);
-        filter.m_zDataBind = cctx.newShaderDataBinding(s_ZPipeline,
-            nullptr, nullptr, nullptr, s_VtxFmt,
+        filter.m_zDataBind = cctx.newShaderDataBinding(s_ZPipeline, s_VtxFmt,
             filter.m_vbo, nullptr, nullptr, 1, bufs,
             nullptr, nullptr, nullptr, 0, nullptr, nullptr, nullptr);
         filter._buildTex(ctx);
@@ -76,10 +74,10 @@ CWorldShadowShader::Initialize(boo::ID3DDataFactory::Context& ctx)
         {nullptr, nullptr, boo::VertexSemantic::Position4}
     };
     s_VtxFmt = ctx.newVertexFormat(1, VtxVmt);
-    s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha,
+    s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                        boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips,
                                        boo::ZTest::None, false, true, false, boo::CullMode::None);
-    s_ZPipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha,
+    s_ZPipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, s_VtxFmt, boo::BlendFactor::SrcAlpha,
                                         boo::BlendFactor::InvSrcAlpha, boo::Primitive::TriStrips,
                                         boo::ZTest::LEqual, true, true, false, boo::CullMode::None);
     return new CWorldShadowShaderD3DDataBindingFactory;
diff --git a/amuse b/amuse
index fdf07d6c3..047a91452 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit fdf07d6c332d6d5125c4e32bddec839fa7fa3c05
+Subproject commit 047a91452e20bdf3fd4dd96b92ec8baa41beac47
diff --git a/hecl b/hecl
index 6f86b576e..2ff1ff22b 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 6f86b576ed28e44740c65aaeb330b58ef6b06b13
+Subproject commit 2ff1ff22b3ba5ef8c89de1faea6c992ad4542952