diff --git a/RombaSharp/RombaSharp.Helpers.cs b/RombaSharp/RombaSharp.Helpers.cs
index c57852b6..04bfaf62 100644
--- a/RombaSharp/RombaSharp.Helpers.cs
+++ b/RombaSharp/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", };
 			// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-			datroot.PopulateFromDir(_dats, Hash.DeepHashes, false, false, false, SkipFileType.None, false, false, _tmpdir, false, null, true);
+			datroot.PopulateFromDir(_dats, Hash.DeepHashes, false, false, SkipFileType.None, false, false, _tmpdir, false, null, true);
 			datroot.BucketBy(SortedBy.SHA1, DedupeType.None);
 
 			// Create a List of dat hashes in the database (SHA-1)
@@ -617,7 +617,7 @@ namespace RombaSharp
 			// Now rescan the depot itself
 			DatFile depot = new DatFile();
 			// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-			depot.PopulateFromDir(depotname, Hash.DeepHashes, false, false, true, SkipFileType.None, false, false, _tmpdir, false, null, true);
+			depot.PopulateFromDir(depotname, Hash.DeepHashes, false, false, SkipFileType.None, false, false, _tmpdir, false, null, true);
 			depot.BucketBy(SortedBy.SHA1, DedupeType.None);
 
 			// Set the base queries to use
diff --git a/RombaSharp/RombaSharp.Inits.cs b/RombaSharp/RombaSharp.Inits.cs
index 5143ce7f..023138cb 100644
--- a/RombaSharp/RombaSharp.Inits.cs
+++ b/RombaSharp/RombaSharp.Inits.cs
@@ -42,13 +42,13 @@ namespace RombaSharp
 			foreach (string dir in onlyDirs)
 			{
 				// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-				df.PopulateFromDir(dir, Hash.DeepHashes, false, false, true, SkipFileType.None, false, false, _tmpdir, false, null, true);
+				df.PopulateFromDir(dir, Hash.DeepHashes, false, false, SkipFileType.None, false, false, _tmpdir, false, null, true);
 
 				// If we're looking for only needed, consider the zipfiles themselves too
 				if (onlyNeeded)
 				{
 					// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
-					df.PopulateFromDir(dir, Hash.DeepHashes, false, true, true, SkipFileType.None, false, false, _tmpdir, false, null, true);
+					df.PopulateFromDir(dir, Hash.DeepHashes, false, true, SkipFileType.None, false, false, _tmpdir, false, null, true);
 				}
 			}
 
@@ -176,7 +176,7 @@ namespace RombaSharp
 
 			// Create the sorting object to use and rebuild the needed files
 			ArchiveScanLevel asl = ArchiveTools.GetArchiveScanLevelFromNumbers((onlyNeeded ? 0 : 1), (onlyNeeded ? 0 : 1), (onlyNeeded ? 0 : 1), (onlyNeeded ? 0 : 1));
-			need.RebuildGeneric(onlyDirs, _depots.Keys.ToList()[0], _tmpdir, false /*quickScan*/, false /*date*/,
+			need.RebuildGeneric(onlyDirs, _depots.Keys.ToList()[0], false /*quickScan*/, false /*date*/,
 				false /*delete*/, false /*inverse*/, OutputFormat.TorrentGzip, true /*romba*/, asl, false /*updateDat*/,
 				null /*headerToCheckAgainst*/, true /* ignorechd */);
 		}
@@ -216,7 +216,7 @@ namespace RombaSharp
 
 				// Now scan all of those depots and rebuild
 				ArchiveScanLevel asl = ArchiveTools.GetArchiveScanLevelFromNumbers(1, 1, 1, 1);
-				datFile.RebuildDepot(onlineDepots, outputFolder, _tmpdir, false /*date*/,
+				datFile.RebuildDepot(onlineDepots, outputFolder, false /*date*/,
 					false /*delete*/, false /*inverse*/, (copy ? OutputFormat.TorrentGzip : OutputFormat.TorrentZip), copy,
 					false /*updateDat*/, null /*headerToCheckAgainst*/);
 			}
@@ -253,7 +253,7 @@ namespace RombaSharp
 			{
 				// TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
 				datdata.PopulateFromDir(input, Hash.DeepHashes /* omitFromScan */, true /* bare */, false /* archivesAsFiles */,
-					true /* enableGzip */, SkipFileType.None, false /* addBlanks */, false /* addDate */, _tmpdir /* tempDir */, false /* copyFiles */,
+					SkipFileType.None, false /* addBlanks */, false /* addDate */, _tmpdir /* tempDir */, false /* copyFiles */,
 					null /* headerToCheckAgainst */, true /* ignorechd */);
 				datdata.WriteToFile("");
 			}
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index 537f2ca3..822de10a 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -122,7 +122,7 @@ namespace SabreTools
 				usegame = true;
 			DatFormat datFormat = 0x0;
 			DedupeType dedup = DedupeType.None;
-			Hash omitFromScan = Hash.SHA256 | Hash.SHA384 | Hash.SHA512; // Should be set to 0x0 later
+			Hash omitFromScan = Hash.DeepHashes; // TODO: All instances of Hash.DeepHashes should be made into 0x0 eventually
 			Hash stripHash = 0x0;
 			OutputFormat outputFormat = OutputFormat.Folder;
 			SkipFileType skipFileType = SkipFileType.None;