diff --git a/Directory.Build.props b/Directory.Build.props
index 1dda2dd..1d41c28 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">
       <PrivateAssets>all</PrivateAssets>
-      <Version>3.6.133</Version>
+      <Version>3.6.139</Version>
     </PackageReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/PetroglyphTools b/PetroglyphTools
index adf607f..bed47f6 160000
--- a/PetroglyphTools
+++ b/PetroglyphTools
@@ -1 +1 @@
-Subproject commit adf607fbe479c315ea142564f08b637e839914b1
+Subproject commit bed47f643f89ad151035e236a3a3a0207cf7dde0
diff --git a/src/ModVerify/ModVerify.csproj b/src/ModVerify/ModVerify.csproj
index bc7995d..1da53e4 100644
--- a/src/ModVerify/ModVerify.csproj
+++ b/src/ModVerify/ModVerify.csproj
@@ -20,7 +20,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.0.3-beta" />
+	  <PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.0.15-beta" />
 	  <PackageReference Include="IsExternalInit" Version="1.0.3">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj b/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj
index ba82246..6b118d5 100644
--- a/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj
+++ b/src/PetroglyphTools/PG.StarWarsGame.Engine/PG.StarWarsGame.Engine.csproj
@@ -17,7 +17,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.0.3-beta" />
+		<PackageReference Include="AnakinRaW.CommonUtilities.SimplePipeline" Version="12.0.15-beta" />
 		<PackageReference Include="IsExternalInit" Version="1.0.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/PetroglyphTools/PG.StarWarsGame.Engine/Repositories/GameRepository.cs b/src/PetroglyphTools/PG.StarWarsGame.Engine/Repositories/GameRepository.cs
index 74c21df..55efd5e 100644
--- a/src/PetroglyphTools/PG.StarWarsGame.Engine/Repositories/GameRepository.cs
+++ b/src/PetroglyphTools/PG.StarWarsGame.Engine/Repositories/GameRepository.cs
@@ -249,9 +249,10 @@ internal void Seal()
 
     protected MegDataEntryReference? FindFileInMasterMeg(string filePath)
     {
-        // TODO To Span, as we don't use the name elsewhere
-        var normalizedPath = _megPathNormalizer.Normalize(filePath);
-        var crc = _crc32HashingService.GetCrc32(normalizedPath, PGConstants.PGCrc32Encoding);
+        Span<char> fileNameBuffer = stackalloc char[260];
+        var length = _megPathNormalizer.Normalize(filePath.AsSpan(), fileNameBuffer);
+        var fileName = fileNameBuffer.Slice(0, length);
+        var crc = _crc32HashingService.GetCrc32(fileName, PGConstants.PGCrc32Encoding);
 
         return MasterMegArchive?.FirstEntryWithCrc(crc);
     }