diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 3abcc10c..a89e589f 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -63,7 +63,7 @@ namespace SabreTools.Library.DatFiles
                 EnsureKey(key);
 
                 // Now return the value
-                return Items[key];
+                return Items[key].Where(i => i != null).ToList();
             }
         }
 
diff --git a/SabreTools.Library/DatFiles/DatStats.cs b/SabreTools.Library/DatFiles/DatStats.cs
index 8b5abf26..51604f6f 100644
--- a/SabreTools.Library/DatFiles/DatStats.cs
+++ b/SabreTools.Library/DatFiles/DatStats.cs
@@ -295,6 +295,10 @@ namespace SabreTools.Library.DatFiles
         /// <param name="item">Item to remove info for</param>
         public void RemoveItem(DatItem item)
         {
+            // If we have a null item, we can't do anything
+            if (item == null)
+                return;
+
             // No matter what the item is, we increate the count
             lock (_lockObject)
             {
diff --git a/SabreTools.Library/Tools/PathExtensions.cs b/SabreTools.Library/Tools/PathExtensions.cs
index 0a49d5fc..832e49df 100644
--- a/SabreTools.Library/Tools/PathExtensions.cs
+++ b/SabreTools.Library/Tools/PathExtensions.cs
@@ -47,7 +47,7 @@ namespace SabreTools.Library.Tools
             {
                 string filename = Path.GetFileName(path);
                 if (sanitize)
-                    filename.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-');
+                    filename = filename.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-');
 
                 return filename;
             }
@@ -61,7 +61,7 @@ namespace SabreTools.Library.Tools
             {
                 string filename = Path.GetFileName(child);
                 if (sanitize)
-                    filename.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-');
+                    filename = filename.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-');
 
                 return filename;
             }
@@ -71,7 +71,7 @@ namespace SabreTools.Library.Tools
             {
                 string filename = child.Remove(0, parent.Length + 1);
                 if (sanitize)
-                    filename.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-');
+                    filename = filename.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-');
 
                 return filename;
             }