diff --git a/BinaryObjectScanner/FileType/BFPK.cs b/BinaryObjectScanner/FileType/BFPK.cs
index 0adf5e6c..7ed618f3 100644
--- a/BinaryObjectScanner/FileType/BFPK.cs
+++ b/BinaryObjectScanner/FileType/BFPK.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/BSP.cs b/BinaryObjectScanner/FileType/BSP.cs
index b9251700..f18df89c 100644
--- a/BinaryObjectScanner/FileType/BSP.cs
+++ b/BinaryObjectScanner/FileType/BSP.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/BZip2.cs b/BinaryObjectScanner/FileType/BZip2.cs
index 42b7a5db..139ee13b 100644
--- a/BinaryObjectScanner/FileType/BZip2.cs
+++ b/BinaryObjectScanner/FileType/BZip2.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
+            if (stream == null)
+                return null;
+
             try
             {
                 // Create a temp output directory
diff --git a/BinaryObjectScanner/FileType/CFB.cs b/BinaryObjectScanner/FileType/CFB.cs
index 634fe987..a55c8b74 100644
--- a/BinaryObjectScanner/FileType/CFB.cs
+++ b/BinaryObjectScanner/FileType/CFB.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/GCF.cs b/BinaryObjectScanner/FileType/GCF.cs
index fab7b3f6..09ced04d 100644
--- a/BinaryObjectScanner/FileType/GCF.cs
+++ b/BinaryObjectScanner/FileType/GCF.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/GZIP.cs b/BinaryObjectScanner/FileType/GZIP.cs
index fb51743b..5cf1f655 100644
--- a/BinaryObjectScanner/FileType/GZIP.cs
+++ b/BinaryObjectScanner/FileType/GZIP.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
+            if (stream == null)
+                return null;
+
             try
             {
                 // Create a temp output directory
diff --git a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
index 7cf6efaa..a60409d2 100644
--- a/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
+++ b/BinaryObjectScanner/FileType/InstallShieldArchiveV3.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/InstallShieldCAB.cs b/BinaryObjectScanner/FileType/InstallShieldCAB.cs
index fa260de1..762e9546 100644
--- a/BinaryObjectScanner/FileType/InstallShieldCAB.cs
+++ b/BinaryObjectScanner/FileType/InstallShieldCAB.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             // Get the name of the first cabinet file or header
diff --git a/BinaryObjectScanner/FileType/MPQ.cs b/BinaryObjectScanner/FileType/MPQ.cs
index db6e16c2..9cea722e 100644
--- a/BinaryObjectScanner/FileType/MPQ.cs
+++ b/BinaryObjectScanner/FileType/MPQ.cs
@@ -33,7 +33,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
 #if NET6_0_OR_GREATER
diff --git a/BinaryObjectScanner/FileType/MicrosoftCAB.cs b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
index 2ae79561..090cd444 100644
--- a/BinaryObjectScanner/FileType/MicrosoftCAB.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftCAB.cs
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/FileType/MicrosoftLZ.cs b/BinaryObjectScanner/FileType/MicrosoftLZ.cs
index a1f1f30e..7ccbe29f 100644
--- a/BinaryObjectScanner/FileType/MicrosoftLZ.cs
+++ b/BinaryObjectScanner/FileType/MicrosoftLZ.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/PAK.cs b/BinaryObjectScanner/FileType/PAK.cs
index 165cd87a..f0f443b9 100644
--- a/BinaryObjectScanner/FileType/PAK.cs
+++ b/BinaryObjectScanner/FileType/PAK.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/PFF.cs b/BinaryObjectScanner/FileType/PFF.cs
index 3ca2af7f..215197fe 100644
--- a/BinaryObjectScanner/FileType/PFF.cs
+++ b/BinaryObjectScanner/FileType/PFF.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/PKZIP.cs b/BinaryObjectScanner/FileType/PKZIP.cs
index 555a144d..6ffa8911 100644
--- a/BinaryObjectScanner/FileType/PKZIP.cs
+++ b/BinaryObjectScanner/FileType/PKZIP.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
+            if (stream == null)
+                return null;
+
             try
             {
                 // Create a temp output directory
diff --git a/BinaryObjectScanner/FileType/Quantum.cs b/BinaryObjectScanner/FileType/Quantum.cs
index a5ee4380..e96faba5 100644
--- a/BinaryObjectScanner/FileType/Quantum.cs
+++ b/BinaryObjectScanner/FileType/Quantum.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/RAR.cs b/BinaryObjectScanner/FileType/RAR.cs
index bbd836b8..21b4e90a 100644
--- a/BinaryObjectScanner/FileType/RAR.cs
+++ b/BinaryObjectScanner/FileType/RAR.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
+            if (stream == null)
+                return null;
+
             try
             {
                 // Create a temp output directory
diff --git a/BinaryObjectScanner/FileType/SFFS.cs b/BinaryObjectScanner/FileType/SFFS.cs
index 2d41793f..d59fad8c 100644
--- a/BinaryObjectScanner/FileType/SFFS.cs
+++ b/BinaryObjectScanner/FileType/SFFS.cs
@@ -70,7 +70,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/FileType/SGA.cs b/BinaryObjectScanner/FileType/SGA.cs
index d5476e3c..420c794f 100644
--- a/BinaryObjectScanner/FileType/SGA.cs
+++ b/BinaryObjectScanner/FileType/SGA.cs
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/SevenZip.cs b/BinaryObjectScanner/FileType/SevenZip.cs
index 66e74934..2c30c596 100644
--- a/BinaryObjectScanner/FileType/SevenZip.cs
+++ b/BinaryObjectScanner/FileType/SevenZip.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/TapeArchive.cs b/BinaryObjectScanner/FileType/TapeArchive.cs
index 2bb883fd..6ea19aeb 100644
--- a/BinaryObjectScanner/FileType/TapeArchive.cs
+++ b/BinaryObjectScanner/FileType/TapeArchive.cs
@@ -31,9 +31,12 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
+            if (stream == null)
+                return null;
+
             try
             {
                 // Create a temp output directory
diff --git a/BinaryObjectScanner/FileType/VBSP.cs b/BinaryObjectScanner/FileType/VBSP.cs
index be917a7d..2b8dc0f0 100644
--- a/BinaryObjectScanner/FileType/VBSP.cs
+++ b/BinaryObjectScanner/FileType/VBSP.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/VPK.cs b/BinaryObjectScanner/FileType/VPK.cs
index 80156a84..140feb2d 100644
--- a/BinaryObjectScanner/FileType/VPK.cs
+++ b/BinaryObjectScanner/FileType/VPK.cs
@@ -31,7 +31,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/WAD.cs b/BinaryObjectScanner/FileType/WAD.cs
index d69cabdb..ea4f5cc1 100644
--- a/BinaryObjectScanner/FileType/WAD.cs
+++ b/BinaryObjectScanner/FileType/WAD.cs
@@ -29,7 +29,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/XZ.cs b/BinaryObjectScanner/FileType/XZ.cs
index 4e04c1b0..ddc48077 100644
--- a/BinaryObjectScanner/FileType/XZ.cs
+++ b/BinaryObjectScanner/FileType/XZ.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/FileType/XZP.cs b/BinaryObjectScanner/FileType/XZP.cs
index 578c8be9..daa29291 100644
--- a/BinaryObjectScanner/FileType/XZP.cs
+++ b/BinaryObjectScanner/FileType/XZP.cs
@@ -30,7 +30,7 @@ namespace BinaryObjectScanner.FileType
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/Interfaces/IExtractable.cs b/BinaryObjectScanner/Interfaces/IExtractable.cs
index fc87caae..794dc85c 100644
--- a/BinaryObjectScanner/Interfaces/IExtractable.cs
+++ b/BinaryObjectScanner/Interfaces/IExtractable.cs
@@ -32,7 +32,7 @@ namespace BinaryObjectScanner.Interfaces
 #if NET48
         string Extract(Stream stream, string file, bool includeDebug);
 #else
-        string? Extract(Stream stream, string file, bool includeDebug);
+        string? Extract(Stream? stream, string file, bool includeDebug);
 #endif
     }
 }
diff --git a/BinaryObjectScanner/Packer/ASPack.cs b/BinaryObjectScanner/Packer/ASPack.cs
index 855a7ac8..f639d79d 100644
--- a/BinaryObjectScanner/Packer/ASPack.cs
+++ b/BinaryObjectScanner/Packer/ASPack.cs
@@ -74,7 +74,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/AdvancedInstaller.cs b/BinaryObjectScanner/Packer/AdvancedInstaller.cs
index eb55b0b2..fef0df5c 100644
--- a/BinaryObjectScanner/Packer/AdvancedInstaller.cs
+++ b/BinaryObjectScanner/Packer/AdvancedInstaller.cs
@@ -53,7 +53,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/Armadillo.cs b/BinaryObjectScanner/Packer/Armadillo.cs
index e41ce70d..3accf37f 100644
--- a/BinaryObjectScanner/Packer/Armadillo.cs
+++ b/BinaryObjectScanner/Packer/Armadillo.cs
@@ -65,7 +65,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs
index d75c3281..1f320219 100644
--- a/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs
+++ b/BinaryObjectScanner/Packer/AutoPlayMediaStudio.cs
@@ -57,7 +57,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/CExe.cs b/BinaryObjectScanner/Packer/CExe.cs
index 354ef4d6..1c9996ea 100644
--- a/BinaryObjectScanner/Packer/CExe.cs
+++ b/BinaryObjectScanner/Packer/CExe.cs
@@ -73,7 +73,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/Packer/EXEStealth.cs b/BinaryObjectScanner/Packer/EXEStealth.cs
index e18b2f9e..33ddc398 100644
--- a/BinaryObjectScanner/Packer/EXEStealth.cs
+++ b/BinaryObjectScanner/Packer/EXEStealth.cs
@@ -102,7 +102,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
index 9d02e2ba..548b8b34 100644
--- a/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
+++ b/BinaryObjectScanner/Packer/EmbeddedExecutable.cs
@@ -52,7 +52,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/Packer/GenteeInstaller.cs b/BinaryObjectScanner/Packer/GenteeInstaller.cs
index 98cca5dc..b1bf6063 100644
--- a/BinaryObjectScanner/Packer/GenteeInstaller.cs
+++ b/BinaryObjectScanner/Packer/GenteeInstaller.cs
@@ -56,7 +56,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs
index df90aa4c..96ea4528 100644
--- a/BinaryObjectScanner/Packer/HyperTechCrackProof.cs
+++ b/BinaryObjectScanner/Packer/HyperTechCrackProof.cs
@@ -55,7 +55,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/InnoSetup.cs b/BinaryObjectScanner/Packer/InnoSetup.cs
index 66039bf6..fd34242a 100644
--- a/BinaryObjectScanner/Packer/InnoSetup.cs
+++ b/BinaryObjectScanner/Packer/InnoSetup.cs
@@ -81,7 +81,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/InstallAnywhere.cs b/BinaryObjectScanner/Packer/InstallAnywhere.cs
index 8be6e7ab..83d68f15 100644
--- a/BinaryObjectScanner/Packer/InstallAnywhere.cs
+++ b/BinaryObjectScanner/Packer/InstallAnywhere.cs
@@ -52,7 +52,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/InstallerVISE.cs b/BinaryObjectScanner/Packer/InstallerVISE.cs
index 0bc6dfe3..2fdb58e5 100644
--- a/BinaryObjectScanner/Packer/InstallerVISE.cs
+++ b/BinaryObjectScanner/Packer/InstallerVISE.cs
@@ -54,7 +54,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs
index b20986ff..0c7116bf 100644
--- a/BinaryObjectScanner/Packer/IntelInstallationFramework.cs
+++ b/BinaryObjectScanner/Packer/IntelInstallationFramework.cs
@@ -57,7 +57,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs
index 77a70cb7..398e6b6e 100644
--- a/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs
+++ b/BinaryObjectScanner/Packer/MicrosoftCABSFX.cs
@@ -71,7 +71,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/NSIS.cs b/BinaryObjectScanner/Packer/NSIS.cs
index 380980a6..c79e5d6b 100644
--- a/BinaryObjectScanner/Packer/NSIS.cs
+++ b/BinaryObjectScanner/Packer/NSIS.cs
@@ -56,7 +56,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/NeoLite.cs b/BinaryObjectScanner/Packer/NeoLite.cs
index 0ece86af..1b4a988e 100644
--- a/BinaryObjectScanner/Packer/NeoLite.cs
+++ b/BinaryObjectScanner/Packer/NeoLite.cs
@@ -61,7 +61,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/PECompact.cs b/BinaryObjectScanner/Packer/PECompact.cs
index 38bf0666..65df3af9 100644
--- a/BinaryObjectScanner/Packer/PECompact.cs
+++ b/BinaryObjectScanner/Packer/PECompact.cs
@@ -65,7 +65,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/Petite.cs b/BinaryObjectScanner/Packer/Petite.cs
index e68836a5..8f1d8806 100644
--- a/BinaryObjectScanner/Packer/Petite.cs
+++ b/BinaryObjectScanner/Packer/Petite.cs
@@ -48,7 +48,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/SetupFactory.cs b/BinaryObjectScanner/Packer/SetupFactory.cs
index 77328272..7f7f1a3d 100644
--- a/BinaryObjectScanner/Packer/SetupFactory.cs
+++ b/BinaryObjectScanner/Packer/SetupFactory.cs
@@ -62,7 +62,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/SevenZipSFX.cs b/BinaryObjectScanner/Packer/SevenZipSFX.cs
index ef0c9c27..f5daf160 100644
--- a/BinaryObjectScanner/Packer/SevenZipSFX.cs
+++ b/BinaryObjectScanner/Packer/SevenZipSFX.cs
@@ -69,7 +69,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/Shrinker.cs b/BinaryObjectScanner/Packer/Shrinker.cs
index b69907f0..af063ad2 100644
--- a/BinaryObjectScanner/Packer/Shrinker.cs
+++ b/BinaryObjectScanner/Packer/Shrinker.cs
@@ -49,7 +49,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/UPX.cs b/BinaryObjectScanner/Packer/UPX.cs
index eeb3fc0f..f85a56ce 100644
--- a/BinaryObjectScanner/Packer/UPX.cs
+++ b/BinaryObjectScanner/Packer/UPX.cs
@@ -87,7 +87,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Packer/WinRARSFX.cs b/BinaryObjectScanner/Packer/WinRARSFX.cs
index d843a896..0b647a41 100644
--- a/BinaryObjectScanner/Packer/WinRARSFX.cs
+++ b/BinaryObjectScanner/Packer/WinRARSFX.cs
@@ -54,7 +54,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/Packer/WinZipSFX.cs b/BinaryObjectScanner/Packer/WinZipSFX.cs
index 77b009a6..b1ffd18f 100644
--- a/BinaryObjectScanner/Packer/WinZipSFX.cs
+++ b/BinaryObjectScanner/Packer/WinZipSFX.cs
@@ -88,7 +88,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/Packer/WiseInstaller.cs b/BinaryObjectScanner/Packer/WiseInstaller.cs
index d31f207a..9527e630 100644
--- a/BinaryObjectScanner/Packer/WiseInstaller.cs
+++ b/BinaryObjectScanner/Packer/WiseInstaller.cs
@@ -100,7 +100,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             try
diff --git a/BinaryObjectScanner/Packer/dotFuscator.cs b/BinaryObjectScanner/Packer/dotFuscator.cs
index ba29acab..867cc20a 100644
--- a/BinaryObjectScanner/Packer/dotFuscator.cs
+++ b/BinaryObjectScanner/Packer/dotFuscator.cs
@@ -52,7 +52,7 @@ namespace BinaryObjectScanner.Packer
 #if NET48
         public string Extract(Stream stream, string file, bool includeDebug)
 #else
-        public string? Extract(Stream stream, string file, bool includeDebug)
+        public string? Extract(Stream? stream, string file, bool includeDebug)
 #endif
         {
             return null;
diff --git a/BinaryObjectScanner/Utilities/Dictionary.cs b/BinaryObjectScanner/Utilities/Dictionary.cs
index 82ccea2c..d0205009 100644
--- a/BinaryObjectScanner/Utilities/Dictionary.cs
+++ b/BinaryObjectScanner/Utilities/Dictionary.cs
@@ -116,7 +116,11 @@ namespace BinaryObjectScanner.Utilities
         /// </summary>
         /// <param name="original">Dictionary to strip values from</param>
         /// <param name="pathToPrepend">Path to strip from the keys</param>
+#if NET48
         public static void PrependToKeys(ConcurrentDictionary<string, ConcurrentQueue<string>> original, string pathToPrepend)
+#else
+        public static void PrependToKeys(ConcurrentDictionary<string, ConcurrentQueue<string>>? original, string pathToPrepend)
+#endif
         {
             // If the dictionary is missing, we can't do anything
             if (original == null)
@@ -146,7 +150,11 @@ namespace BinaryObjectScanner.Utilities
         /// </summary>
         /// <param name="original">Dictionary to strip values from</param>
         /// <param name="pathToStrip">Path to strip from the keys</param>
+#if NET48
         public static void StripFromKeys(ConcurrentDictionary<string, ConcurrentQueue<string>> original, string pathToStrip)
+#else
+        public static void StripFromKeys(ConcurrentDictionary<string, ConcurrentQueue<string>>? original, string? pathToStrip)
+#endif
         {
             // If either is missing, we can't do anything
             if (original == null || string.IsNullOrEmpty(pathToStrip))