diff --git a/SabreTools.Serialization/Models/BZip2/Archive.cs b/SabreTools.Serialization/Models/BZip2/Archive.cs
index ffacc92f..a949d9cc 100644
--- a/SabreTools.Serialization/Models/BZip2/Archive.cs
+++ b/SabreTools.Serialization/Models/BZip2/Archive.cs
@@ -6,13 +6,13 @@ namespace SabreTools.Data.Models.BZip2
         /// <summary>
         /// Stream header
         /// </summary>
-        public Header? Header { get; set; }
+        public Header Header { get; set; }
 
         // TODO: Implement remaining structures
 
         /// <summary>
         /// Stream footer
         /// </summary>
-        public Footer? Footer { get; set; }
+        public Footer Footer { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/BZip2/Block.cs b/SabreTools.Serialization/Models/BZip2/Block.cs
index d527576e..13fab1ec 100644
--- a/SabreTools.Serialization/Models/BZip2/Block.cs
+++ b/SabreTools.Serialization/Models/BZip2/Block.cs
@@ -5,7 +5,7 @@ namespace SabreTools.Data.Models.BZip2
         /// <summary>
         /// Block header
         /// </summary>
-        public BlockHeader? Header { get; set; }
+        public BlockHeader Header { get; set; }
 
         // TODO: Implement remaining structures
     }
diff --git a/SabreTools.Serialization/Models/BZip2/BlockTrees.cs b/SabreTools.Serialization/Models/BZip2/BlockTrees.cs
index 9d735a06..c7d269c1 100644
--- a/SabreTools.Serialization/Models/BZip2/BlockTrees.cs
+++ b/SabreTools.Serialization/Models/BZip2/BlockTrees.cs
@@ -23,4 +23,4 @@ namespace SabreTools.Data.Models.BZip2
 
         // TODO: Implement Trees
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/BZip2/Header.cs b/SabreTools.Serialization/Models/BZip2/Header.cs
index 49b27941..5e5ef70a 100644
--- a/SabreTools.Serialization/Models/BZip2/Header.cs
+++ b/SabreTools.Serialization/Models/BZip2/Header.cs
@@ -5,7 +5,7 @@ namespace SabreTools.Data.Models.BZip2
         /// <summary>
         /// "BZ"
         /// </summary>
-        public string? Signature { get; set; }
+        public string Signature { get; set; }
 
         /// <summary>
         /// Version byte