diff --git a/hecl/extern/libBoo b/hecl/extern/libBoo
index c9edf8dd8..d040e2009 160000
--- a/hecl/extern/libBoo
+++ b/hecl/extern/libBoo
@@ -1 +1 @@
-Subproject commit c9edf8dd8573662921522d40cdd38837f7db2154
+Subproject commit d040e20096d50d0f8af623f4d2bb05f5e5b0ba73
diff --git a/hecl/lib/Backend/Metal.cpp b/hecl/lib/Backend/Metal.cpp
index 313e0adba..da36b88cb 100644
--- a/hecl/lib/Backend/Metal.cpp
+++ b/hecl/lib/Backend/Metal.cpp
@@ -16,11 +16,11 @@ std::string Metal::EmitTexGenSource2(TexGenSrc src, int uvIdx) const
 {
     switch (src)
     {
-        case TG_POS:
+        case TexGenSrc::Position:
             return "v.posIn.xy\n";
-        case TG_NRM:
+        case TexGenSrc::Normal:
             return "v.normIn.xy\n";
-        case TG_UV:
+        case TexGenSrc::UV:
             return HECL::Format("v.uvIn%u", uvIdx);
         default: break;
     }
@@ -31,11 +31,11 @@ std::string Metal::EmitTexGenSource4(TexGenSrc src, int uvIdx) const
 {
     switch (src)
     {
-        case TG_POS:
+        case TexGenSrc::Position:
             return "float4(v.posIn, 1.0)\n";
-        case TG_NRM:
+        case TexGenSrc::Normal:
             return "float4(v.normIn, 1.0)\n";
-        case TG_UV:
+        case TexGenSrc::UV:
             return HECL::Format("float4(v.uvIn%u, 0.0, 1.0)", uvIdx);
         default: break;
     }
@@ -290,8 +290,8 @@ struct MetalBackendFactory : IShaderBackendFactory
         
         ShaderCachedData dataOut(tag, cachedSz);
         Athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
-        w.writeUByte(m_backend.m_blendSrc);
-        w.writeUByte(m_backend.m_blendDst);
+        w.writeUByte(atUint8(m_backend.m_blendSrc));
+        w.writeUByte(atUint8(m_backend.m_blendDst));
         w.writeString(vertSource);
         w.writeString(fragSource);
         
@@ -358,8 +358,8 @@ struct MetalBackendFactory : IShaderBackendFactory
         
         ShaderCachedData dataOut(tag, cachedSz);
         Athena::io::MemoryWriter w(dataOut.m_data.get(), dataOut.m_sz);
-        w.writeUByte(m_backend.m_blendSrc);
-        w.writeUByte(m_backend.m_blendDst);
+        w.writeUByte(atUint8(m_backend.m_blendSrc));
+        w.writeUByte(atUint8(m_backend.m_blendDst));
         w.writeString(vertSource);
         for (const std::string src : fragSources)
             w.writeString(src);
diff --git a/hecl/lib/Runtime/ShaderCacheManager.cpp b/hecl/lib/Runtime/ShaderCacheManager.cpp
index 69d5fd466..737512dac 100644
--- a/hecl/lib/Runtime/ShaderCacheManager.cpp
+++ b/hecl/lib/Runtime/ShaderCacheManager.cpp
@@ -123,7 +123,7 @@ ShaderCacheManager::ShaderCacheManager(const FileStoreManager& storeMgr,
         m_factory.reset(_NewHLSLBackendFactory(gfxFactory));
         break;
 #elif __APPLE__ && HECL_HAS_METAL
-    case boo::IGraphicsDataFactory::PlatformMetal:
+    case boo::IGraphicsDataFactory::Platform::Metal:
         m_factory.reset(_NewMetalBackendFactory(gfxFactory));
         break;
 #endif