diff --git a/DataSpec/DNACommon/DNACommon.cpp b/DataSpec/DNACommon/DNACommon.cpp
index 1c3633442..df01e6037 100644
--- a/DataSpec/DNACommon/DNACommon.cpp
+++ b/DataSpec/DNACommon/DNACommon.cpp
@@ -104,7 +104,7 @@ void UniqueID32::write(athena::io::YAMLDocWriter& writer) const
     if (!path)
         return;
     writer.writeString(nullptr, path.getAuxInfo().size() ?
-        (path.getRelativePathUTF8() + _S('|') + path.getAuxInfoUTF8()) :
+        (path.getRelativePathUTF8() + '|' + path.getAuxInfoUTF8()) :
          path.getRelativePathUTF8());
 }
 size_t UniqueID32::binarySize(size_t __isz) const
@@ -186,7 +186,7 @@ void UniqueID64::write(athena::io::YAMLDocWriter& writer) const
     if (!path)
         return;
     writer.writeString(nullptr, path.getAuxInfo().size() ?
-        (path.getRelativePathUTF8() + _S('|') + path.getAuxInfoUTF8()) :
+        (path.getRelativePathUTF8() + '|' + path.getAuxInfoUTF8()) :
          path.getRelativePathUTF8());
 }
 size_t UniqueID64::binarySize(size_t __isz) const
@@ -222,7 +222,7 @@ void UniqueID128::write(athena::io::YAMLDocWriter& writer) const
     if (!path)
         return;
     writer.writeString(nullptr, path.getAuxInfo().size() ?
-        (path.getRelativePathUTF8() + _S('|') + path.getAuxInfoUTF8()) :
+        (path.getRelativePathUTF8() + '|' + path.getAuxInfoUTF8()) :
          path.getRelativePathUTF8());
 }
 size_t UniqueID128::binarySize(size_t __isz) const
diff --git a/DataSpec/DNACommon/PAK.cpp b/DataSpec/DNACommon/PAK.cpp
index ed4447edf..d9ef9c0ec 100644
--- a/DataSpec/DNACommon/PAK.cpp
+++ b/DataSpec/DNACommon/PAK.cpp
@@ -266,7 +266,10 @@ hecl::ProjectPath PAKRouter<BRIDGETYPE>::getCharacterWorking(const EntryType* en
     {
         hecl::ProjectPath characterPath = getWorking(characterSearch->second.first);
         if (entry->type == FOURCC('EVNT'))
-            return characterPath.getWithExtension((_S(".") + characterSearch->second.second).c_str(), true);
+        {
+            hecl::SystemStringView wideStr(characterSearch->second.second);
+            return characterPath.getWithExtension((_S(".") + wideStr.sys_str()).c_str(), true);
+        }
         return characterPath.ensureAuxInfo(characterSearch->second.second);
     }
     return {};
diff --git a/Editor/ProjectResourceFactoryBase.cpp b/Editor/ProjectResourceFactoryBase.cpp
index 8ab7e9de0..0b731f190 100644
--- a/Editor/ProjectResourceFactoryBase.cpp
+++ b/Editor/ProjectResourceFactoryBase.cpp
@@ -15,7 +15,7 @@ static void WriteTag(athena::io::YAMLDocWriter& cacheWriter,
     cacheWriter.enterSubVector(idStr);
     cacheWriter.writeString(nullptr, pathTag.type.toString().c_str());
     cacheWriter.writeString(nullptr, path.getAuxInfo().size() ?
-        (path.getRelativePathUTF8() + _S('|') + path.getAuxInfoUTF8()) :
+        (path.getRelativePathUTF8() + '|' + path.getAuxInfoUTF8()) :
          path.getRelativePathUTF8());
     cacheWriter.leaveSubVector();
 }
@@ -86,7 +86,7 @@ void ProjectResourceFactoryBase::ReadCatalog(const hecl::ProjectPath& catalogPat
             continue;
         SObjectTag pathTag = TagFromPath(path, m_backgroundBlender);
         if (pathTag)
-        {            
+        {
             std::unique_lock<std::mutex> lk(m_backgroundIndexMutex);
             m_catalogNameToTag[pLower] = pathTag;
             WriteNameTag(nameWriter, pathTag, p.first);
@@ -162,7 +162,7 @@ bool ProjectResourceFactoryBase::AddFileToIndex(const hecl::ProjectPath& path,
 
         /* Special multi-resource intermediates */
         if (pathTag.type == SBIG('ANCS'))
-        {            
+        {
             hecl::BlenderConnection& conn = m_backgroundBlender.getBlenderConnection();
             if (!conn.openBlend(path) || conn.getBlendType() != hecl::BlenderConnection::BlendType::Actor)
                 return false;
diff --git a/Runtime/CMemoryCardSys.cpp b/Runtime/CMemoryCardSys.cpp
index 436d2e3c6..fd80e5d27 100644
--- a/Runtime/CMemoryCardSys.cpp
+++ b/Runtime/CMemoryCardSys.cpp
@@ -2,6 +2,7 @@
 #include "GameGlobalObjects.hpp"
 #include "CSimplePool.hpp"
 #include "CGameState.hpp"
+#include "GuiSys/CStringTable.hpp"
 
 namespace urde
 {
diff --git a/hecl b/hecl
index 164c8be0e..3764728bc 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit 164c8be0e0c13f0746687f6b36e9b6dd4086a2f1
+Subproject commit 3764728bccf2261a71a6d91130710aeed47fe832