diff --git a/SabreTools.Serialization/Models/MoPaQ/Archive.cs b/SabreTools.Serialization/Models/MoPaQ/Archive.cs
index 430f0280..0fc1faba 100644
--- a/SabreTools.Serialization/Models/MoPaQ/Archive.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/Archive.cs
@@ -19,7 +19,7 @@
         /// <summary>
         /// MPQ Header (required)
         /// </summary>
-        public ArchiveHeader? ArchiveHeader { get; set; }
+        public ArchiveHeader ArchiveHeader { get; set; }
 
         // TODO: Files (optional)
         // TODO: Special files (optional)
diff --git a/SabreTools.Serialization/Models/MoPaQ/ArchiveHeader.cs b/SabreTools.Serialization/Models/MoPaQ/ArchiveHeader.cs
index f8353733..e9c8f8d9 100644
--- a/SabreTools.Serialization/Models/MoPaQ/ArchiveHeader.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/ArchiveHeader.cs
@@ -11,7 +11,7 @@
         /// <summary>
         /// The MPQ archive signature
         /// </summary>
-        public string? Signature { get; set; }
+        public string Signature { get; set; }
 
         /// <summary>
         /// Size of the archive header
diff --git a/SabreTools.Serialization/Models/MoPaQ/BetTable.cs b/SabreTools.Serialization/Models/MoPaQ/BetTable.cs
index 7e5ad750..9a1e2edf 100644
--- a/SabreTools.Serialization/Models/MoPaQ/BetTable.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/BetTable.cs
@@ -17,7 +17,7 @@ namespace SabreTools.Data.Models.MoPaQ
         /// 'BET\x1A'
         /// </summary>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
-        public string? Signature;
+        public string Signature;
 
         /// <summary>
         /// Version. Seems to be always 1
@@ -130,7 +130,7 @@ namespace SabreTools.Data.Models.MoPaQ
         /// Followed by array of file flags. Each entry is 32-bit size and its meaning is the same like
         /// </summary>
         /// <remarks>Size from <see cref="FlagCount"/></remarks>
-        public uint[]? FlagsArray { get; set; }
+        public uint[] FlagsArray { get; set; }
 
         // File table. Size of each entry is taken from dwTableEntrySize.
         // Size of the table is (dwTableEntrySize * dwMaxFileCount), round up to 8.
diff --git a/SabreTools.Serialization/Models/MoPaQ/Constants.cs b/SabreTools.Serialization/Models/MoPaQ/Constants.cs
index 8464d51b..0192e812 100644
--- a/SabreTools.Serialization/Models/MoPaQ/Constants.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/Constants.cs
@@ -65,7 +65,7 @@ namespace SabreTools.Data.Models.MoPaQ
         public const ulong BSDIFF40SignatureValue = 0x3034464649445342;
 
         #endregion
-        
+
         #region Encryption
 
         /// <summary>
@@ -80,4 +80,4 @@ namespace SabreTools.Data.Models.MoPaQ
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/MoPaQ/HetTable.cs b/SabreTools.Serialization/Models/MoPaQ/HetTable.cs
index f547eae7..8bf80bea 100644
--- a/SabreTools.Serialization/Models/MoPaQ/HetTable.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/HetTable.cs
@@ -18,7 +18,7 @@ namespace SabreTools.Data.Models.MoPaQ
         /// 'HET\x1A'
         /// </summary>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
-        public string? Signature;
+        public string Signature;
 
         /// <summary>
         /// Version. Seems to be always 1
@@ -82,6 +82,6 @@ namespace SabreTools.Data.Models.MoPaQ
         /// Array of file indexes. Bit size of each entry is taken from dwTotalIndexSize.
         /// Table size is taken from dwHashTableSize.
         /// </summary>
-        public byte[][]? FileIndexes { get; set; }
+        public byte[][] FileIndexes { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/MoPaQ/PatchInfo.cs b/SabreTools.Serialization/Models/MoPaQ/PatchInfo.cs
index 0ad35553..8fabe267 100644
--- a/SabreTools.Serialization/Models/MoPaQ/PatchInfo.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/PatchInfo.cs
@@ -37,6 +37,6 @@ namespace SabreTools.Data.Models.MoPaQ
         /// <remarks>0 entries</remarks>
         /// TODO: Determine the number of entries
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0)]
-        public uint[]? SectorOffsetTable;
+        public uint[] SectorOffsetTable;
     }
 }
diff --git a/SabreTools.Serialization/Models/MoPaQ/UserData.cs b/SabreTools.Serialization/Models/MoPaQ/UserData.cs
index c5de91f8..ea14e74a 100644
--- a/SabreTools.Serialization/Models/MoPaQ/UserData.cs
+++ b/SabreTools.Serialization/Models/MoPaQ/UserData.cs
@@ -17,7 +17,7 @@ namespace SabreTools.Data.Models.MoPaQ
         /// <see cref="SignatureValue"/>
         /// <remarks>4 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
-        public string? Signature;
+        public string Signature;
 
         /// <summary>
         /// Maximum size of the user data
diff --git a/SabreTools.Serialization/Wrappers/MoPaQ.Printing.cs b/SabreTools.Serialization/Wrappers/MoPaQ.Printing.cs
index 9c1e6081..d8097f3c 100644
--- a/SabreTools.Serialization/Wrappers/MoPaQ.Printing.cs
+++ b/SabreTools.Serialization/Wrappers/MoPaQ.Printing.cs
@@ -45,17 +45,10 @@ namespace SabreTools.Serialization.Wrappers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, ArchiveHeader? header)
+        private static void Print(StringBuilder builder, ArchiveHeader header)
         {
             builder.AppendLine("  Archive Header Information:");
             builder.AppendLine("  -------------------------");
-            if (header == null)
-            {
-                builder.AppendLine("  No archive header");
-                builder.AppendLine();
-                return;
-            }
-
             builder.AppendLine(header.Signature, "  Signature");
             builder.AppendLine(header.HeaderSize, "  Header size");
             builder.AppendLine(header.ArchiveSize, "  Archive size");
@@ -112,7 +105,7 @@ namespace SabreTools.Serialization.Wrappers
 
             builder.AppendLine("  File indexes:");
             builder.AppendLine("  -------------------------");
-            if (table.FileIndexes == null)
+            if (table.FileIndexes.Length == 0)
             {
                 builder.AppendLine("  No file indexes ");
             }