diff --git a/hecl/blender/BlenderConnection.hpp b/hecl/blender/BlenderConnection.hpp
index 6afaa6ad9..9c190aa06 100644
--- a/hecl/blender/BlenderConnection.hpp
+++ b/hecl/blender/BlenderConnection.hpp
@@ -377,7 +377,7 @@ public:
         /** Intermediate mesh representation prepared by blender from a single mesh object */
         struct Mesh
         {
-            enum HMDLTopology topology;
+            HMDLTopology topology;
 
             /* Cumulative AABB */
             Vector3f aabbMin;
diff --git a/hecl/extern/libBoo b/hecl/extern/libBoo
index d040e2009..84b78f296 160000
--- a/hecl/extern/libBoo
+++ b/hecl/extern/libBoo
@@ -1 +1 @@
-Subproject commit d040e20096d50d0f8af623f4d2bb05f5e5b0ba73
+Subproject commit 84b78f2962a1d36694e000d7e151a44a64d3e24b
diff --git a/hecl/include/HECL/HECL.hpp b/hecl/include/HECL/HECL.hpp
index 2e6d3b374..d84482804 100644
--- a/hecl/include/HECL/HECL.hpp
+++ b/hecl/include/HECL/HECL.hpp
@@ -216,7 +216,7 @@ static inline FILE* Fopen(const SystemChar* path, const SystemChar* mode, FileLo
     {
 #if _WIN32
         OVERLAPPED ov = {};
-        LockFileEx((HANDLE)(uintptr_t)_fileno(fp), (lock == LWRITE) ? LOCKFILE_EXCLUSIVE_LOCK : 0, 0, 0, 1, &ov);
+        LockFileEx((HANDLE)(uintptr_t)_fileno(fp), (lock == FileLockType::Write) ? LOCKFILE_EXCLUSIVE_LOCK : 0, 0, 0, 1, &ov);
 #else
         if (flock(fileno(fp), ((lock == FileLockType::Write) ? LOCK_EX : LOCK_SH) | LOCK_NB))
             LogModule.report(LogVisor::FatalError, "flock %s: %s", path, strerror(errno));
diff --git a/hecl/lib/Backend/HLSL.cpp b/hecl/lib/Backend/HLSL.cpp
index f415a89da..ace221128 100644
--- a/hecl/lib/Backend/HLSL.cpp
+++ b/hecl/lib/Backend/HLSL.cpp
@@ -15,11 +15,11 @@ std::string HLSL::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;
     }
@@ -30,11 +30,11 @@ std::string HLSL::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;
     }
@@ -284,8 +284,8 @@ struct HLSLBackendFactory : 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));
 
         if (vertBlob)
         {
@@ -399,8 +399,8 @@ struct HLSLBackendFactory : 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));
 
         if (vertBlob)
         {
diff --git a/hecl/lib/Runtime/ShaderCacheManager.cpp b/hecl/lib/Runtime/ShaderCacheManager.cpp
index 737512dac..1919f3fbf 100644
--- a/hecl/lib/Runtime/ShaderCacheManager.cpp
+++ b/hecl/lib/Runtime/ShaderCacheManager.cpp
@@ -118,8 +118,8 @@ ShaderCacheManager::ShaderCacheManager(const FileStoreManager& storeMgr,
         m_factory.reset(_NewGLSLBackendFactory(gfxFactory));
         break;
 #if _WIN32
-    case boo::IGraphicsDataFactory::PlatformD3D11:
-    case boo::IGraphicsDataFactory::PlatformD3D12:
+    case boo::IGraphicsDataFactory::Platform::D3D11:
+    case boo::IGraphicsDataFactory::Platform::D3D12:
         m_factory.reset(_NewHLSLBackendFactory(gfxFactory));
         break;
 #elif __APPLE__ && HECL_HAS_METAL