diff --git a/hecl/extern/athena b/hecl/extern/athena
index 017a921fd..f414abe5a 160000
--- a/hecl/extern/athena
+++ b/hecl/extern/athena
@@ -1 +1 @@
-Subproject commit 017a921fdc0207590df519093fc06362ab04d457
+Subproject commit f414abe5a5d359a77add09061fe1ad5e4413ee32
diff --git a/hecl/extern/boo b/hecl/extern/boo
index fa8989bed..2ada7130d 160000
--- a/hecl/extern/boo
+++ b/hecl/extern/boo
@@ -1 +1 @@
-Subproject commit fa8989bed30bd5022c4951ae46adc4de50a261f1
+Subproject commit 2ada7130d37ef699be48ceaa043407889f8218ea
diff --git a/hecl/lib/Backend/GLSL.cpp b/hecl/lib/Backend/GLSL.cpp
index 7c1f96afe..0655a8afe 100644
--- a/hecl/lib/Backend/GLSL.cpp
+++ b/hecl/lib/Backend/GLSL.cpp
@@ -5,7 +5,7 @@
 #include <boo/graphicsdev/GL.hpp>
 #include <boo/graphicsdev/Vulkan.hpp>
 
-static logvisor::Module GLSL_Log("hecl::Backend::GLSL");
+static logvisor::Module Log("hecl::Backend::GLSL");
 
 namespace hecl::Backend
 {
@@ -406,7 +406,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
         cachedSz += fragSource.size() + 1;
 
         if (m_backend.m_texMapEnd > 8)
-            GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
+            Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
 
         objOut =
         static_cast<boo::GLDataFactory::Context&>(ctx).
@@ -419,7 +419,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
                                   tag.getDepthWrite(), true, false,
                                   tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None);
         if (!objOut)
-            GLSL_Log.report(logvisor::Fatal, "unable to build shader");
+            Log.report(logvisor::Fatal, "unable to build shader");
 
         ShaderCachedData dataOut(tag, cachedSz);
         athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
@@ -447,7 +447,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
             return nullptr;
 
         if (texMapEnd > 8)
-            GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
+            Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
 
         auto ret =
         static_cast<boo::GLDataFactory::Context&>(ctx).
@@ -459,7 +459,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
                                   tag.getDepthWrite(), true, false,
                                   tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None);
         if (!ret)
-            GLSL_Log.report(logvisor::Fatal, "unable to build shader");
+            Log.report(logvisor::Fatal, "unable to build shader");
         return ret;
     }
 
@@ -474,7 +474,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
         size_t cachedSz = 3;
 
         if (m_backend.m_texMapEnd > 8)
-            GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
+            Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
 
         std::vector<std::pair<std::string, std::string>> sources;
         sources.reserve(extensionSlots.size());
@@ -530,7 +530,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
                                       (tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) :
                                       boo::CullMode(slot.cullMode));
             if (!ret)
-                GLSL_Log.report(logvisor::Fatal, "unable to build shader");
+                Log.report(logvisor::Fatal, "unable to build shader");
             returnFunc(ret);
         }
 
@@ -563,7 +563,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
             return false;
 
         if (texMapEnd > 8)
-            GLSL_Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
+            Log.report(logvisor::Fatal, "maximum of 8 texture maps supported");
 
         for (const ShaderCacheExtensions::ExtensionSlot& slot : extensionSlots)
         {
@@ -613,7 +613,7 @@ struct GLSLBackendFactory : IShaderBackendFactory
                                       (tag.getBackfaceCulling() ? boo::CullMode::Backface : boo::CullMode::None) :
                                       boo::CullMode(slot.cullMode));
             if (!ret)
-                GLSL_Log.report(logvisor::Fatal, "unable to build shader");
+                Log.report(logvisor::Fatal, "unable to build shader");
             returnFunc(ret);
         }
 
diff --git a/hecl/lib/Backend/HLSL.cpp b/hecl/lib/Backend/HLSL.cpp
index dbc86b854..f8337fd70 100644
--- a/hecl/lib/Backend/HLSL.cpp
+++ b/hecl/lib/Backend/HLSL.cpp
@@ -347,7 +347,8 @@ std::string HLSL::makeFrag(bool alphaTest, ReflectionType reflectionType,
 }
 
 }
-namespace Runtime
+
+namespace hecl::Runtime
 {
 
 struct HLSLBackendFactory : IShaderBackendFactory
diff --git a/hecl/lib/Blender/Connection.cpp b/hecl/lib/Blender/Connection.cpp
index d88068783..06b1cb2c6 100644
--- a/hecl/lib/Blender/Connection.cpp
+++ b/hecl/lib/Blender/Connection.cpp
@@ -22,6 +22,9 @@
 #include <fcntl.h>
 #endif
 
+#undef min
+#undef max
+
 namespace std
 {
 template <> struct hash<std::pair<uint32_t,uint32_t>>
diff --git a/hecl/lib/Blender/HMDL.cpp b/hecl/lib/Blender/HMDL.cpp
index 8643bef85..87dd37e97 100644
--- a/hecl/lib/Blender/HMDL.cpp
+++ b/hecl/lib/Blender/HMDL.cpp
@@ -2,6 +2,9 @@
 #include <cmath>
 #include <cfloat>
 
+#undef min
+#undef max
+
 namespace hecl::blender
 {
 
diff --git a/hecl/lib/Runtime/ShaderCacheManager.cpp b/hecl/lib/Runtime/ShaderCacheManager.cpp
index 97b6825c6..7f04d8862 100644
--- a/hecl/lib/Runtime/ShaderCacheManager.cpp
+++ b/hecl/lib/Runtime/ShaderCacheManager.cpp
@@ -8,6 +8,9 @@
 #include "hecl/Backend/GLSL.hpp"
 #include "hecl/Backend/Metal.hpp"
 
+#undef min
+#undef max
+
 namespace hecl::Runtime
 {
 #if BOO_HAS_GL