diff --git a/SabreTools.DatTools/DatFromDir.cs b/SabreTools.DatTools/DatFromDir.cs
index 3a2cb05c..dcf5b7d4 100644
--- a/SabreTools.DatTools/DatFromDir.cs
+++ b/SabreTools.DatTools/DatFromDir.cs
@@ -93,8 +93,9 @@ namespace SabreTools.DatTools
                 logger.User(totalSize, currentSize);
                 foreach (string item in files)
                 {
-                    CheckFileForHashes(datFile, item, basePath, asFiles, skipFileType, addBlanks, hashes);
                     currentSize += new FileInfo(item).Length;
+
+                    CheckFileForHashes(datFile, item, basePath, asFiles, skipFileType, addBlanks, hashes);
                     logger.User(totalSize, currentSize, item);
                 }
 
diff --git a/SabreTools.FileTypes/Archives/GZipArchive.cs b/SabreTools.FileTypes/Archives/GZipArchive.cs
index 201184ae..e6745d11 100644
--- a/SabreTools.FileTypes/Archives/GZipArchive.cs
+++ b/SabreTools.FileTypes/Archives/GZipArchive.cs
@@ -251,7 +251,7 @@ namespace SabreTools.FileTypes.Archives
                     gzstream!.Dispose();
                 }
 
-                // Fill in comon details and add to the list
+                // Fill in common details and add to the list
                 gzipEntryRom.Parent = gamename;
                 _children.Add(gzipEntryRom);
             }
diff --git a/SabreTools.FileTypes/Archives/RarArchive.cs b/SabreTools.FileTypes/Archives/RarArchive.cs
index 99e2cac2..7c7377dc 100644
--- a/SabreTools.FileTypes/Archives/RarArchive.cs
+++ b/SabreTools.FileTypes/Archives/RarArchive.cs
@@ -217,7 +217,7 @@ namespace SabreTools.FileTypes.Archives
                         rarEntryRom = GetInfo(entryStream, size: entry.Size, hashes: this.AvailableHashTypes);
                     }
 
-                    // Fill in comon details and add to the list
+                    // Fill in common details and add to the list
                     rarEntryRom.Filename = entry.Key;
                     rarEntryRom.Parent = gamename;
                     rarEntryRom.Date = entry.LastModifiedTime?.ToString("yyyy/MM/dd hh:mm:ss");
diff --git a/SabreTools.FileTypes/Archives/SevenZipArchive.cs b/SabreTools.FileTypes/Archives/SevenZipArchive.cs
index 930a4d29..c961a117 100644
--- a/SabreTools.FileTypes/Archives/SevenZipArchive.cs
+++ b/SabreTools.FileTypes/Archives/SevenZipArchive.cs
@@ -328,7 +328,7 @@ namespace SabreTools.FileTypes.Archives
                         zipEntryRom = GetInfo(readStream, size: (long)zf.GetLocalFile(i).UncompressedSize, hashes: this.AvailableHashTypes, keepReadOpen: true);
                     }
 
-                    // Fill in comon details and add to the list
+                    // Fill in common details and add to the list
                     zipEntryRom.Filename = zf.GetLocalFile(i).Filename;
                     zipEntryRom.Parent = gamename;
                     found.Add(zipEntryRom);
diff --git a/SabreTools.FileTypes/Archives/TapeArchive.cs b/SabreTools.FileTypes/Archives/TapeArchive.cs
index 4121033e..e783f7fa 100644
--- a/SabreTools.FileTypes/Archives/TapeArchive.cs
+++ b/SabreTools.FileTypes/Archives/TapeArchive.cs
@@ -210,7 +210,7 @@ namespace SabreTools.FileTypes.Archives
                         tarEntryRom = GetInfo(entryStream, size: entry.Size, hashes: this.AvailableHashTypes);
                     }
 
-                    // Fill in comon details and add to the list
+                    // Fill in common details and add to the list
                     tarEntryRom.Filename = entry.Key;
                     tarEntryRom.Parent = gamename;
                     tarEntryRom.Date = entry.LastModifiedTime?.ToString("yyyy/MM/dd hh:mm:ss");
diff --git a/SabreTools.FileTypes/Archives/XZArchive.cs b/SabreTools.FileTypes/Archives/XZArchive.cs
index c0a1b1e4..b2f4bf42 100644
--- a/SabreTools.FileTypes/Archives/XZArchive.cs
+++ b/SabreTools.FileTypes/Archives/XZArchive.cs
@@ -228,7 +228,7 @@ namespace SabreTools.FileTypes.Archives
                     xzStream.Dispose();
                 }
 
-                // Fill in comon details and add to the list
+                // Fill in common details and add to the list
                 xzEntryRom.Parent = gamename;
                 _children.Add(xzEntryRom);
             }
diff --git a/SabreTools.FileTypes/BaseFile.cs b/SabreTools.FileTypes/BaseFile.cs
index d3e0e114..fa54c268 100644
--- a/SabreTools.FileTypes/BaseFile.cs
+++ b/SabreTools.FileTypes/BaseFile.cs
@@ -368,9 +368,14 @@ namespace SabreTools.FileTypes
 
             // Deal with the input stream
             if (!keepReadOpen)
+            {
+                input.Close();
                 input.Dispose();
+            }
             else
+            {
                 input.SeekIfPossible();
+            }
 
             return baseFile;
         }