diff --git a/CSharp/Libraries/UniversalEditor.Compression/UniversalEditor.Compression.csproj b/CSharp/Libraries/UniversalEditor.Compression/UniversalEditor.Compression.csproj
index 9828bf92..82281723 100644
--- a/CSharp/Libraries/UniversalEditor.Compression/UniversalEditor.Compression.csproj
+++ b/CSharp/Libraries/UniversalEditor.Compression/UniversalEditor.Compression.csproj
@@ -34,13 +34,13 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Bzip2\Bzip2CompressionModule.cs" />
-    <Compile Include="Bzip2\Internal\BZip2.cs" />
-    <Compile Include="Bzip2\Internal\BZip2Constants.cs" />
-    <Compile Include="Bzip2\Internal\BZip2Exception.cs" />
-    <Compile Include="Bzip2\Internal\BZip2InputStream.cs" />
-    <Compile Include="Bzip2\Internal\BZip2OutputStream.cs" />
-    <Compile Include="Bzip2\Internal\StreamUtils.cs" />
+    <Compile Include="Modules\Bzip2\Bzip2CompressionModule.cs" />
+    <Compile Include="Modules\Bzip2\Internal\BZip2.cs" />
+    <Compile Include="Modules\Bzip2\Internal\BZip2Constants.cs" />
+    <Compile Include="Modules\Bzip2\Internal\BZip2Exception.cs" />
+    <Compile Include="Modules\Bzip2\Internal\BZip2InputStream.cs" />
+    <Compile Include="Modules\Bzip2\Internal\BZip2OutputStream.cs" />
+    <Compile Include="Modules\Bzip2\Internal\StreamUtils.cs" />
     <Compile Include="Common\BlockType.cs" />
     <Compile Include="Common\BurrowsWheelerTransform.cs" />
     <Compile Include="Common\CompressionTracingSwitch.cs" />
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs
index 77c22ed5..2a5cae5c 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/FAT/FATDataFormat.cs
@@ -682,10 +682,10 @@ namespace UniversalEditor.DataFormats.FileSystem.FAT
 
             #region Extended BIOS Parameter Block
             {
-                bw.Write(mvarExtendedBiosParameterBlock.PhysicalDriveNumber);
+                bw.WriteByte(mvarExtendedBiosParameterBlock.PhysicalDriveNumber);
 
                 byte reserved1 = (byte)mvarExtendedBiosParameterBlock.CheckDiskFlags;
-                bw.Write(reserved1);
+                bw.WriteByte(reserved1);
 
                 // Extended boot signature. (Should be 0x29 to indicate that an EBPB with the following 3 entries
                 // exists (since OS/2 1.2 and DOS 4.0). Can be 0x28 on some OS/2 1.0-1.1 and PC DOS 3.4 disks
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/HPK/HPKDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/HPK/HPKDataFormat.cs
index eca0f4d3..05eb2a09 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/HPK/HPKDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/HPK/HPKDataFormat.cs
@@ -64,7 +64,7 @@ namespace UniversalEditor.DataFormats.FileSystem.HPK
                 byte[] data = UniversalEditor.Compression.CompressionModules.Zlib.Decompress(zlibdata);
                 if (data.Length != decompressedFileSize) throw new InvalidDataFormatException("Decompressed size does not match stored value!");
 
-                br = new IO.Reader(data);
+                br = new IO.Reader(new MemoryAccessor(data));
                 br.Accessor.Position = 16;
                 mvarCompressed = true;
             }
@@ -119,7 +119,7 @@ namespace UniversalEditor.DataFormats.FileSystem.HPK
                     byte[] folderData = br.ReadBytes(fi.length);
                     br.Accessor.Position = pos;
 
-                    IO.Reader brf = new IO.Reader(folderData);
+                    IO.Reader brf = new IO.Reader(new MemoryAccessor(folderData));
 
                     int j = 1;
                     while (!brf.EndOfStream)
diff --git a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/MementoMori/RESDataFormat.cs b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/MementoMori/RESDataFormat.cs
index 618e9f3a..59701d9c 100644
--- a/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/MementoMori/RESDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/MementoMori/RESDataFormat.cs
@@ -69,7 +69,7 @@ namespace UniversalEditor.DataFormats.FileSystem.MementoMori
 			if (fsom == null) throw new ObjectModelNotSupportedException();
 
 			IO.Writer bw = base.Accessor.Writer;
-			bw.WriteFixedLengthString("Centauri Production Resource File 3.10\n\n", Encoding.Unicode);
+			bw.WriteFixedLengthString("Centauri Production Resource File 3.10\n\n", Encoding.UTF16LittleEndian);
 
 			File[] files = fsom.GetAllFiles();
 			bw.WriteUInt32((uint)files.Length);