diff --git a/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs b/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs
index 7f149713..9c1a489b 100644
--- a/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs
+++ b/BinaryObjectScanner/Protection/Macrovision.SafeDisc.cs
@@ -163,18 +163,18 @@ namespace BinaryObjectScanner.Protection
                 }, "SafeDisc 1.45.011-1.50.020"),
 
                 // Search for the splash screen files known to sometimes contain a generic SafeDisc splash-screen.
-                new PathMatchSet(new FilePathMatch("00000000.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000000.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("0000040c.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("0000040c.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000407.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000407.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000409.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000409.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000809.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000809.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00001009.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00001009.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000000.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000000.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("0000040c.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("0000040c.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000407.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000407.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000409.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000409.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000809.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000809.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00001009.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00001009.256"), GetSafeDiscSplshVersion, "SafeDisc"),
 
                 // Found to be present in every version of SafeDisc, possibly every single release.
                 //new(new FilePathMatch("00000001.TMP"), GetSafeDisc00000001TMPVersion, "SafeDisc"),
@@ -255,18 +255,18 @@ namespace BinaryObjectScanner.Protection
                 new(new FilePathMatch("00000002.TMP"), "SafeDisc 2+"),
 
                 // Search for the splash screen files known to sometimes contain a generic SafeDisc splash-screen.
-                new PathMatchSet(new FilePathMatch("00000000.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000000.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("0000040c.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("0000040c.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000407.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000407.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000409.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000409.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000809.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00000809.256"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00001009.016"), GetSafeDiscSplshVersion, "SafeDisc"),
-                new PathMatchSet(new FilePathMatch("00001009.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000000.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000000.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("0000040c.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("0000040c.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000407.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000407.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000409.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000409.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000809.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00000809.256"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00001009.016"), GetSafeDiscSplshVersion, "SafeDisc"),
+                new(new FilePathMatch("00001009.256"), GetSafeDiscSplshVersion, "SafeDisc"),
 
 
                 new(new FilePathMatch("DPLAYERX.DLL"), GetSafeDiscDPlayerXVersion, "SafeDisc"),
@@ -735,7 +735,7 @@ namespace BinaryObjectScanner.Protection
             };
         }
 
-        internal static string GetSafeDiscSplshVersion(string firstMatchedString, IEnumerable<string>? files)
+        internal static string? GetSafeDiscSplshVersion(string firstMatchedString, IEnumerable<string>? files)
         {
             if (string.IsNullOrEmpty(firstMatchedString) || !File.Exists(firstMatchedString))
                 return string.Empty;
diff --git a/BinaryObjectScanner/Protection/Macrovision.cs b/BinaryObjectScanner/Protection/Macrovision.cs
index 828876cb..b9b231cf 100644
--- a/BinaryObjectScanner/Protection/Macrovision.cs
+++ b/BinaryObjectScanner/Protection/Macrovision.cs
@@ -390,7 +390,7 @@ namespace BinaryObjectScanner.Protection
                 // Found in Redump entries 13230, 15383, and 36511.
                 // SafeDisc 4+ is known to sometimes use old versions of drivers, such as in Redump entry 101261.
                 12_528 => "3.19.000 / SafeDisc 3.10.020-3.15.011/4+",
-                
+
                 // Found in Redump entries 58625 and 84586.
                 11_973 => "3.22.000 / SafeDisc 3.20.020-3.20.022",
 
@@ -431,7 +431,7 @@ namespace BinaryObjectScanner.Protection
                     // SafeDisc 4+ is known to sometimes use old versions of drivers, such as in Redump entry 101261.
                     // The product version is "3.19.000 Windows NT/2K/XP 2003/03/19".
                     "3.19.000" => "3.19.000 / SafeDisc 3.10.020-3.15.011/4+",
-                    
+
                     // Found in Redump entries 58625 and 84586.
                     // The product version is "SECURITY Driver 3.22.000 2004/01/16".
                     "3.22.000" => "3.22.000 / SafeDisc 3.20.020-3.20.022",