diff --git a/RombaSharp/Partials/RombaSharp.Helpers.cs b/RombaSharp/Partials/RombaSharp.Helpers.cs
index d60f5ef3..c2c28e0a 100644
--- a/RombaSharp/Partials/RombaSharp.Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp.Helpers.cs
@@ -404,7 +404,7 @@ namespace RombaSharp
 
 			// First get a list of SHA-1's from the input DATs
 			DatFile datroot = new DatFile { Type = "SuperDAT", };
-			datroot.PopulateFromDir(_dats, false, false, false, false, false, false, false, _tmpdir, false, null, 4, _logger);
+			datroot.PopulateFromDir(_dats, false, false, true, false, false, false, false, false, _tmpdir, false, null, 4, _logger);
 			datroot.BucketBySHA1(false, _logger, false);
 
 			// Create a List of dat hashes in the database (SHA-1)
@@ -618,7 +618,7 @@ namespace RombaSharp
 
 			// Now rescan the depot itself
 			DatFile depot = new DatFile();
-			depot.PopulateFromDir(depotname, false, false, false, false, true, false, false, _tmpdir, false, null, _workers, _logger);
+			depot.PopulateFromDir(depotname, false, false, true, false, false, true, false, false, _tmpdir, false, null, _workers, _logger);
 			depot.BucketBySHA1(false, _logger, false);
 
 			// Set the base queries to use
diff --git a/RombaSharp/Partials/RombaSharp.Inits.cs b/RombaSharp/Partials/RombaSharp.Inits.cs
index 880682e9..101c3b32 100644
--- a/RombaSharp/Partials/RombaSharp.Inits.cs
+++ b/RombaSharp/Partials/RombaSharp.Inits.cs
@@ -41,12 +41,12 @@ namespace RombaSharp
 			DatFile df = new DatFile();
 			foreach (string dir in onlyDirs)
 			{
-				df.PopulateFromDir(dir, false, false, false, false, true, false, false, _tmpdir, false, null, _workers, _logger);
+				df.PopulateFromDir(dir, false, false, true, false, false, true, false, false, _tmpdir, false, null, _workers, _logger);
 
 				// If we're looking for only needed, consider the zipfiles themselves too
 				if (onlyNeeded)
 				{
-					df.PopulateFromDir(dir, false, false, false, true, true, false, false, _tmpdir, false, null, _workers, _logger);
+					df.PopulateFromDir(dir, false, false, true, false, true, true, false, false, _tmpdir, false, null, _workers, _logger);
 				}
 			}
 
@@ -250,7 +250,7 @@ namespace RombaSharp
 			Logger logger = new Logger();
 			foreach (string input in inputs)
 			{
-				datdata.PopulateFromDir(input, false /* noMD5 */, false /* noSHA1 */, true /* bare */, false /* archivesAsFiles */,
+				datdata.PopulateFromDir(input, false /* noMD5 */, false /* noSHA1 */, true /* noSHA256 */, true /* bare */, false /* archivesAsFiles */,
 					true /* enableGzip */, false /* addBlanks */, false /* addDate */, _tmpdir /* tempDir */, false /* copyFiles */,
 					null /* headerToCheckAgainst */, _workers /* maxDegreeOfParallelism */, _logger);
 				datdata.WriteToFile("", logger);
diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs b/SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs
index d92d8f15..20b3df01 100644
--- a/SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs
+++ b/SabreTools.Helper/Dats/Partials/DatFile.Parsers.cs
@@ -2499,7 +2499,7 @@ namespace SabreTools.Helper.Dats
 				// Sanitize the hashes from null, hex sizes, and "true blank" strings
 				itemDisk.MD5 = Style.CleanHashData(itemDisk.MD5, Constants.MD5Length);
 				itemDisk.SHA1 = Style.CleanHashData(itemDisk.SHA1, Constants.SHA1Length);
-				itemDisk.SHA256 = Style.CleanHashData(itemRom.SHA256, Constants.SHA256Length);
+				itemDisk.SHA256 = Style.CleanHashData(itemDisk.SHA256, Constants.SHA256Length);
 
 				// If the file has aboslutely no hashes, skip and log
 				if (itemDisk.ItemStatus != ItemStatus.Nodump
diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
index d23b5d4e..20a1925b 100644
--- a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
+++ b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
@@ -887,7 +887,8 @@ namespace SabreTools.Helper.Dats
 			logger.User("Processing files:\n");
 			foreach (string input in inputs)
 			{
-				PopulateFromDir(input, quickScan /* noMD5 */, quickScan /* noSHA1 */, true /* bare */, false /* archivesAsFiles */,
+				// TODO: Eventually migrate noSHA256 to quickScan instead of true
+				PopulateFromDir(input, quickScan /* noMD5 */, quickScan /* noSHA1 */, true /* noSHA256 */, true /* bare */, false /* archivesAsFiles */,
 					true /* enableGzip */, false /* addBlanks */, false /* addDate */, tempDir /* tempDir */, false /* copyFiles */,
 					headerToCheckAgainst, 4 /* maxDegreeOfParallelism */, logger);
 			}