diff --git a/3rdparty/glslang b/3rdparty/glslang
index 8243ca3..8a85691 160000
--- a/3rdparty/glslang
+++ b/3rdparty/glslang
@@ -1 +1 @@
-Subproject commit 8243ca3c30527152c909b100292e4360e189663f
+Subproject commit 8a85691a0740d390761a1008b4696f57facd02c4
diff --git a/kraken/KRModelView.cpp b/kraken/KRModelView.cpp
index 75045c8..dbb5e7e 100644
--- a/kraken/KRModelView.cpp
+++ b/kraken/KRModelView.cpp
@@ -68,6 +68,7 @@ bool KRModelView::getShaderValue(ShaderValue value, Vector3* output) const
         return true;
       }
     }
+    return false;
 }
 bool KRModelView::getShaderValue(ShaderValue value, Matrix4* output) const
 {
diff --git a/kraken/KRRenderGraph.cpp b/kraken/KRRenderGraph.cpp
index 55e76c8..a98d8e5 100644
--- a/kraken/KRRenderGraph.cpp
+++ b/kraken/KRRenderGraph.cpp
@@ -33,6 +33,7 @@
 #include "KRRenderPass.h"
 #include "KRSurface.h"
 #include "KRDevice.h"
+#include <array>
 
 KRRenderGraph::KRRenderGraph(KRContext& context)
   : KRContextObject(context)
diff --git a/kraken/KRRenderPass.cpp b/kraken/KRRenderPass.cpp
index 619bbf4..4fae7ef 100644
--- a/kraken/KRRenderPass.cpp
+++ b/kraken/KRRenderPass.cpp
@@ -32,6 +32,7 @@
 #include "KRRenderPass.h"
 #include "KRSurface.h"
 #include "KRSwapchain.h"
+#include <array>
 
 using namespace hydra;
 
diff --git a/kraken/KRSwapchain.cpp b/kraken/KRSwapchain.cpp
index e07ab1b..2c1a9bb 100644
--- a/kraken/KRSwapchain.cpp
+++ b/kraken/KRSwapchain.cpp
@@ -32,6 +32,8 @@
 #include "KRSwapchain.h"
 #include "KRRenderPass.h"
 
+#include <array>
+
 KRSwapchain::KRSwapchain(KRContext& context)
   : KRContextObject(context)
   , m_swapChain(VK_NULL_HANDLE)
diff --git a/kraken/KRViewport.cpp b/kraken/KRViewport.cpp
index f2915f3..61ec178 100755
--- a/kraken/KRViewport.cpp
+++ b/kraken/KRViewport.cpp
@@ -58,25 +58,20 @@ KRViewport::KRViewport(const Vector2& size, const Matrix4& matView, const Matrix
 bool KRViewport::getShaderValue(ShaderValue value, Matrix4* output) const
 {
   switch (value) {
-  case ShaderValue::projection_matrix:
-  {
-    *output = m_matProjection;
-    return true;
-  }
-  case ShaderValue::invp:
-  {
-    *output = m_matInverseProjection;
-    return true;
+    case ShaderValue::projection_matrix:
+      *output = m_matProjection;
+      return true;
+    case ShaderValue::invp:
+      *output = m_matInverseProjection;
+      return true;
   }
   return false;
-  }
 }
 
 bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const
 {
   switch (value) {
     case ShaderValue::viewport:
-    {
       *output = Vector4::Create(
         0.0f,
         0.0f,
@@ -84,7 +79,6 @@ bool KRViewport::getShaderValue(ShaderValue value, Vector4* output) const
         getSize().y
       );
       return true;
-    }
   }
 
   return false;