diff --git a/SabreTools.Serialization/Models/BFPK/Archive.cs b/SabreTools.Serialization/Models/BFPK/Archive.cs
index 86962263..a10a53c6 100644
--- a/SabreTools.Serialization/Models/BFPK/Archive.cs
+++ b/SabreTools.Serialization/Models/BFPK/Archive.cs
@@ -9,11 +9,11 @@
         /// <summary>
         /// Header
         /// </summary>
-        public Header? Header { get; set; }
+        public Header Header { get; set; }
 
         /// <summary>
         /// Files
         /// </summary>
-        public FileEntry[]? Files { get; set; }
+        public FileEntry[] Files { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/BFPK/Constants.cs b/SabreTools.Serialization/Models/BFPK/Constants.cs
index c3825d24..cda564d3 100644
--- a/SabreTools.Serialization/Models/BFPK/Constants.cs
+++ b/SabreTools.Serialization/Models/BFPK/Constants.cs
@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.BFPK
 
         public const uint SignatureUInt32 = 0x4b504642;
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/BFPK/FileEntry.cs b/SabreTools.Serialization/Models/BFPK/FileEntry.cs
index db07eb4d..02ca4790 100644
--- a/SabreTools.Serialization/Models/BFPK/FileEntry.cs
+++ b/SabreTools.Serialization/Models/BFPK/FileEntry.cs
@@ -14,7 +14,7 @@
         /// <summary>
         /// Name
         /// </summary>
-        public string? Name { get; set; }
+        public string Name { get; set; }
 
         /// <summary>
         /// Uncompressed size
diff --git a/SabreTools.Serialization/Models/BFPK/Header.cs b/SabreTools.Serialization/Models/BFPK/Header.cs
index 75cbb10d..b1cf2666 100644
--- a/SabreTools.Serialization/Models/BFPK/Header.cs
+++ b/SabreTools.Serialization/Models/BFPK/Header.cs
@@ -13,7 +13,7 @@ namespace SabreTools.Data.Models.BFPK
         /// "BFPK"
         /// </summary>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
-        public string? Magic;
+        public string Magic;
 
         /// <summary>
         /// Version
diff --git a/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs b/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs
index ace180da..60ed8aaa 100644
--- a/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs
+++ b/SabreTools.Serialization/Wrappers/BFPK.Extraction.cs
@@ -61,7 +61,7 @@ namespace SabreTools.Serialization.Wrappers
                 return false;
 
             // Ensure directory separators are consistent
-            string filename = file.Name ?? $"file{index}";
+            string filename = file.Name.Length == 0 ? $"file{index}" : file.Name;
             if (Path.DirectorySeparatorChar == '\\')
                 filename = filename.Replace('/', '\\');
             else if (Path.DirectorySeparatorChar == '/')
diff --git a/SabreTools.Serialization/Wrappers/BFPK.Printing.cs b/SabreTools.Serialization/Wrappers/BFPK.Printing.cs
index 51e8fe0c..2281a178 100644
--- a/SabreTools.Serialization/Wrappers/BFPK.Printing.cs
+++ b/SabreTools.Serialization/Wrappers/BFPK.Printing.cs
@@ -22,28 +22,21 @@ namespace SabreTools.Serialization.Wrappers
             Print(builder, Model.Files);
         }
 
-        private static void Print(StringBuilder builder, Header? header)
+        private static void Print(StringBuilder builder, Header header)
         {
             builder.AppendLine("  Header Information:");
             builder.AppendLine("  -------------------------");
-            if (header == null)
-            {
-                builder.AppendLine("  No header");
-                builder.AppendLine();
-                return;
-            }
-
             builder.AppendLine(header.Magic, "  Magic");
             builder.AppendLine(header.Version, "  Version");
             builder.AppendLine(header.Files, "  Files");
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, FileEntry[]? entries)
+        private static void Print(StringBuilder builder, FileEntry[] entries)
         {
             builder.AppendLine("  File Table Information:");
             builder.AppendLine("  -------------------------");
-            if (entries == null || entries.Length == 0)
+            if (entries.Length == 0)
             {
                 builder.AppendLine("  No file table items");
                 return;
diff --git a/SabreTools.Serialization/Wrappers/BFPK.cs b/SabreTools.Serialization/Wrappers/BFPK.cs
index 431bb5e0..2bc366f7 100644
--- a/SabreTools.Serialization/Wrappers/BFPK.cs
+++ b/SabreTools.Serialization/Wrappers/BFPK.cs
@@ -15,7 +15,7 @@ namespace SabreTools.Serialization.Wrappers
         #region Extension Properties
 
         /// <inheritdoc cref="Archive.Files"/>
-        public FileEntry[] Files => Model.Files ?? [];
+        public FileEntry[] Files => Model.Files;
 
         #endregion