diff --git a/RombaSharp/Partials/RombaSharp.Helpers.cs b/RombaSharp/Partials/RombaSharp.Helpers.cs
index 78ca943c..9ad6dfe0 100644
--- a/RombaSharp/Partials/RombaSharp.Helpers.cs
+++ b/RombaSharp/Partials/RombaSharp.Helpers.cs
@@ -402,7 +402,8 @@ namespace RombaSharp
 
 			// First get a list of SHA-1's from the input DATs
 			DatFile datroot = new DatFile { Type = "SuperDAT", };
-			datroot.PopulateFromDir(_dats, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, false, false, false, false, _tmpdir, false, null);
+			// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
+			datroot.PopulateFromDir(_dats, Hash.DeepHashes, false, false, false, false, false, _tmpdir, false, null);
 			datroot.BucketBy(SortedBy.SHA1, false /* mergeroms */);
 
 			// Create a List of dat hashes in the database (SHA-1)
@@ -616,7 +617,8 @@ namespace RombaSharp
 
 			// Now rescan the depot itself
 			DatFile depot = new DatFile();
-			depot.PopulateFromDir(depotname, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, false, true, false, false, _tmpdir, false, null);
+			// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
+			depot.PopulateFromDir(depotname, Hash.DeepHashes, false, false, true, false, false, _tmpdir, false, null);
 			depot.BucketBy(SortedBy.SHA1, false /* mergeroms */);
 
 			// Set the base queries to use
diff --git a/RombaSharp/Partials/RombaSharp.Inits.cs b/RombaSharp/Partials/RombaSharp.Inits.cs
index c6cdf36f..5a81e298 100644
--- a/RombaSharp/Partials/RombaSharp.Inits.cs
+++ b/RombaSharp/Partials/RombaSharp.Inits.cs
@@ -41,12 +41,14 @@ namespace RombaSharp
 			DatFile df = new DatFile();
 			foreach (string dir in onlyDirs)
 			{
-				df.PopulateFromDir(dir, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, false, true, false, false, _tmpdir, false, null);
+				// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
+				df.PopulateFromDir(dir, Hash.DeepHashes, false, false, true, false, false, _tmpdir, false, null);
 
 				// If we're looking for only needed, consider the zipfiles themselves too
 				if (onlyNeeded)
 				{
-					df.PopulateFromDir(dir, Hash.SHA256 & Hash.SHA384 & Hash.SHA512, false, true, true, false, false, _tmpdir, false, null);
+					// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
+					df.PopulateFromDir(dir, Hash.DeepHashes, false, true, true, false, false, _tmpdir, false, null);
 				}
 			}
 
@@ -249,7 +251,8 @@ namespace RombaSharp
 
 			foreach (string input in inputs)
 			{
-				datdata.PopulateFromDir(input, Hash.SHA256 & Hash.SHA384 & Hash.SHA512 /* omitFromScan */, true /* bare */, false /* archivesAsFiles */,
+				// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
+				datdata.PopulateFromDir(input, Hash.DeepHashes /* omitFromScan */, true /* bare */, false /* archivesAsFiles */,
 					true /* enableGzip */, false /* addBlanks */, false /* addDate */, _tmpdir /* tempDir */, false /* copyFiles */,
 					null /* headerToCheckAgainst */);
 				datdata.WriteToFile("");
diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
index 12c51165..e0e2fb50 100644
--- a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
+++ b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
@@ -1028,8 +1028,7 @@ namespace SabreTools.Helper.Dats
 		/// <param name="quickScan">True to enable external scanning of archives, false otherwise</param>
 		/// <param name="headerToCheckAgainst">Populated string representing the name of the skipper to use, a blank string to use the first available checker, null otherwise</param>
 		/// <returns>True if verification was a success, false otherwise</returns>
-		public bool VerifyGeneric(List<string> inputs, string tempDir, bool hashOnly, bool quickScan,
-			string headerToCheckAgainst)
+		public bool VerifyGeneric(List<string> inputs, string tempDir, bool hashOnly, bool quickScan, string headerToCheckAgainst)
 		{
 			// Check the temp directory exists
 			if (String.IsNullOrEmpty(tempDir))