diff --git a/SabreTools.IO.Test/Extensions/BinaryWriterExtensionsTests.cs b/SabreTools.IO.Test/Extensions/BinaryWriterExtensionsTests.cs
index 7854042..604886f 100644
--- a/SabreTools.IO.Test/Extensions/BinaryWriterExtensionsTests.cs
+++ b/SabreTools.IO.Test/Extensions/BinaryWriterExtensionsTests.cs
@@ -465,7 +465,7 @@ namespace SabreTools.IO.Test.Extensions
         [Fact]
         public void WriteTypeSequentialTest()
         {
-            var stream = new MemoryStream(new byte[16], 0, 16, true, true);
+            var stream = new MemoryStream(new byte[24], 0, count: 24, true, true);
             var bw = new BinaryWriter(stream);
             var obj = new TestStructSequential
             {
diff --git a/SabreTools.IO.Test/Extensions/ByteArrayExtensionsWriteTests.cs b/SabreTools.IO.Test/Extensions/ByteArrayExtensionsWriteTests.cs
index 7421fcb..23a5030 100644
--- a/SabreTools.IO.Test/Extensions/ByteArrayExtensionsWriteTests.cs
+++ b/SabreTools.IO.Test/Extensions/ByteArrayExtensionsWriteTests.cs
@@ -448,7 +448,7 @@ namespace SabreTools.IO.Test.Extensions
         [Fact]
         public void WriteTypeSequentialTest()
         {
-            byte[] buffer = new byte[16];
+            byte[] buffer = new byte[24];
             int offset = 0;
             var obj = new TestStructSequential
             {
diff --git a/SabreTools.IO.Test/Extensions/StreamExtensionsWriteTests.cs b/SabreTools.IO.Test/Extensions/StreamExtensionsWriteTests.cs
index 3a4728c..bb6ba3b 100644
--- a/SabreTools.IO.Test/Extensions/StreamExtensionsWriteTests.cs
+++ b/SabreTools.IO.Test/Extensions/StreamExtensionsWriteTests.cs
@@ -412,7 +412,7 @@ namespace SabreTools.IO.Test.Extensions
         [Fact]
         public void WriteTypeSequentialTest()
         {
-            var stream = new MemoryStream(new byte[16], 0, 16, true, true);
+            var stream = new MemoryStream(new byte[24], 0, 24, true, true);
             var obj = new TestStructSequential
             {
                 FirstValue = 0x03020100,
diff --git a/SabreTools.IO/Extensions/BinaryWriterExtensions.cs b/SabreTools.IO/Extensions/BinaryWriterExtensions.cs
index 7f9e08a..8f27f4b 100644
--- a/SabreTools.IO/Extensions/BinaryWriterExtensions.cs
+++ b/SabreTools.IO/Extensions/BinaryWriterExtensions.cs
@@ -413,6 +413,7 @@ namespace SabreTools.IO.Extensions
         /// <summary>
         /// Write a <typeparamref name="T"/> to the underlying stream
         /// </summary>
+        /// TODO: Fix writing as reading was fixed
         public static bool WriteType<T>(this BinaryWriter writer, T? value)
         {
             // Handle the null case
diff --git a/SabreTools.IO/Extensions/ByteArrayWriterExtensions.cs b/SabreTools.IO/Extensions/ByteArrayWriterExtensions.cs
index bd53fc6..18cfbac 100644
--- a/SabreTools.IO/Extensions/ByteArrayWriterExtensions.cs
+++ b/SabreTools.IO/Extensions/ByteArrayWriterExtensions.cs
@@ -564,6 +564,7 @@ namespace SabreTools.IO.Extensions
         /// <summary>
         /// Write a <typeparamref name="T"/> to the byte array
         /// </summary>
+        /// TODO: Fix writing as reading was fixed
         public static bool WriteType<T>(this byte[] content, ref int offset, T? value)
         {
             // Handle the null case
diff --git a/SabreTools.IO/Extensions/StreamWriterExtensions.cs b/SabreTools.IO/Extensions/StreamWriterExtensions.cs
index 4f6b4d8..be6f587 100644
--- a/SabreTools.IO/Extensions/StreamWriterExtensions.cs
+++ b/SabreTools.IO/Extensions/StreamWriterExtensions.cs
@@ -565,6 +565,7 @@ namespace SabreTools.IO.Extensions
         /// <summary>
         /// Write a <typeparamref name="T"/> to the stream
         /// </summary>
+        /// TODO: Fix writing as reading was fixed
         public static bool WriteType<T>(this Stream stream, T? value)
         {
             // Handle the null case