diff --git a/SabreTools.Serialization/Models/SpoonInstaller/FileEntry.cs b/SabreTools.Serialization/Models/SpoonInstaller/FileEntry.cs
index 8cab74d3..80071a92 100644
--- a/SabreTools.Serialization/Models/SpoonInstaller/FileEntry.cs
+++ b/SabreTools.Serialization/Models/SpoonInstaller/FileEntry.cs
@@ -28,13 +28,13 @@ namespace SabreTools.Data.Models.SpoonInstaller
         public uint Crc32 { get; set; }
 
         /// <summary>
-        /// Length of <see cref="Filename"/> 
+        /// Length of <see cref="Filename"/>
         /// </summary>
         public byte FilenameLength { get; set; }
 
         /// <summary>
         /// ASCII filename
         /// </summary>
-        public string? Filename { get; set; }
+        public string Filename { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/SpoonInstaller/Footer.cs b/SabreTools.Serialization/Models/SpoonInstaller/Footer.cs
index 006a7ffc..e8a3d6ca 100644
--- a/SabreTools.Serialization/Models/SpoonInstaller/Footer.cs
+++ b/SabreTools.Serialization/Models/SpoonInstaller/Footer.cs
@@ -11,7 +11,7 @@ namespace SabreTools.Data.Models.SpoonInstaller
         /// </summary>
         /// <remarks>
         /// Theorized to be a checksum?
-        /// 
+        ///
         /// Observed values:
         /// - 81 83 DA 2F (802849665)
         /// </remarks>
@@ -41,7 +41,7 @@ namespace SabreTools.Data.Models.SpoonInstaller
         /// </summary>
         /// <remarks>
         /// Could also be part of the signature?
-        /// 
+        ///
         /// Observed values:
         /// - 83 52 34 03 (53760643)
         /// </remarks>
diff --git a/SabreTools.Serialization/Models/SpoonInstaller/SFX.cs b/SabreTools.Serialization/Models/SpoonInstaller/SFX.cs
index ce68cd98..6fa7d77f 100644
--- a/SabreTools.Serialization/Models/SpoonInstaller/SFX.cs
+++ b/SabreTools.Serialization/Models/SpoonInstaller/SFX.cs
@@ -4,12 +4,12 @@ namespace SabreTools.Data.Models.SpoonInstaller
     /// Represents the structure at the end of a Spoon Installer
     /// SFX file. These SFX files store all files bz2-compressed
     /// sequentially in the overlay of an executable.
-    /// 
+    ///
     /// The design is similar to the end of central directory
     /// in a PKZIP file. The footer needs to be read before
     /// the entry table as both the pointer to the start of
     /// the table as well as the entry count are included there.
-    /// 
+    ///
     /// The layout of this is derived from the layout in the
     /// physical file.
     /// </summary>
@@ -18,11 +18,11 @@ namespace SabreTools.Data.Models.SpoonInstaller
         /// <summary>
         /// Set of file entries
         /// </summary>
-        public FileEntry[]? Entries { get; set; }
+        public FileEntry[] Entries { get; set; }
 
         /// <summary>
         /// Footer representing the central directory
         /// </summary>
-        public Footer? Footer { get; set; }
+        public Footer Footer { get; set; }
     }
 }