diff --git a/Aaru.Images/AaruFormat/Properties.cs b/Aaru.Images/AaruFormat/Properties.cs
index 6b536b169..36e58cba4 100644
--- a/Aaru.Images/AaruFormat/Properties.cs
+++ b/Aaru.Images/AaruFormat/Properties.cs
@@ -15,23 +15,23 @@ public sealed partial class AaruFormat
 #region IWritableOpticalImage Members
 
     /// <inheritdoc />
-    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
-                                                           OpticalImageCapabilities.CanStoreDataTracks     |
-                                                           OpticalImageCapabilities.CanStorePregaps        |
-                                                           OpticalImageCapabilities.CanStoreSubchannelRw   |
-                                                           OpticalImageCapabilities.CanStoreSessions       |
-                                                           OpticalImageCapabilities.CanStoreIsrc           |
-                                                           OpticalImageCapabilities.CanStoreCdText         |
-                                                           OpticalImageCapabilities.CanStoreMcn            |
-                                                           OpticalImageCapabilities.CanStoreRawData        |
-                                                           OpticalImageCapabilities.CanStoreCookedData     |
-                                                           OpticalImageCapabilities.CanStoreMultipleTracks |
-                                                           OpticalImageCapabilities.CanStoreNotCdSessions  |
-                                                           OpticalImageCapabilities.CanStoreNotCdTracks    |
-                                                           OpticalImageCapabilities.CanStoreIndexes        |
-                                                           OpticalImageCapabilities.CanStoreHiddenTracks /* |
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks     |
+                                                           OpticalImageCapabilities.CanStoreDataTracks      |
+                                                           OpticalImageCapabilities.CanStorePregaps         |
+                                                           OpticalImageCapabilities.CanStoreSubchannelRw    |
+                                                           OpticalImageCapabilities.CanStoreSessions        |
+                                                           OpticalImageCapabilities.CanStoreIsrc            |
+                                                           OpticalImageCapabilities.CanStoreCdText          |
+                                                           OpticalImageCapabilities.CanStoreMcn             |
+                                                           OpticalImageCapabilities.CanStoreRawData         |
+                                                           OpticalImageCapabilities.CanStoreCookedData      |
+                                                           OpticalImageCapabilities.CanStoreMultipleTracks  |
+                                                           OpticalImageCapabilities.CanStoreNotCdSessions   |
+                                                           OpticalImageCapabilities.CanStoreNotCdTracks     |
+                                                           OpticalImageCapabilities.CanStoreIndexes         |
+                                                           OpticalImageCapabilities.CanStoreHiddenTracks    |
                                                            OpticalImageCapabilities.CanStoreNegativeSectors |
-                                                           OpticalImageCapabilities.CanStoreOverflowSectors*/;
+                                                           OpticalImageCapabilities.CanStoreOverflowSectors;
 
     /// <inheritdoc />
 
diff --git a/Aaru.Images/AaruFormat/Write.cs b/Aaru.Images/AaruFormat/Write.cs
index 7f07bf672..b047a01f1 100644
--- a/Aaru.Images/AaruFormat/Write.cs
+++ b/Aaru.Images/AaruFormat/Write.cs
@@ -209,8 +209,8 @@ public sealed partial class AaruFormat
                                     mediaType,
                                     sectorSize,
                                     sectors,
-                                    0,
-                                    0,
+                                    negativeSectors,
+                                    overflowSectors,
                                     optionsString,
                                     applicationName,
                                     (byte)applicationName.Length,
@@ -288,9 +288,8 @@ public sealed partial class AaruFormat
 
         // Convert array of booleans to List of enums
         for(nuint i = 0; i < sizet_length; i++)
-        {
-            if(sectorTagsBuffer[i] != 0) _imageInfo.ReadableSectorTags.Add((SectorTagType)i);
-        }
+            if(sectorTagsBuffer[i] != 0)
+                _imageInfo.ReadableSectorTags.Add((SectorTagType)i);
 
         sizet_length = 0;
         ret          = aaruf_get_readable_media_tags(_context, null, ref sizet_length);
@@ -314,9 +313,8 @@ public sealed partial class AaruFormat
 
         // Convert array of booleans to List of enums
         for(nuint i = 0; i < sizet_length; i++)
-        {
-            if(mediaTagsBuffer[i] != 0) _imageInfo.ReadableMediaTags.Add((MediaTagType)i);
-        }
+            if(mediaTagsBuffer[i] != 0)
+                _imageInfo.ReadableMediaTags.Add((MediaTagType)i);
 
         ret = aaruf_get_media_sequence(_context, out int sequence, out int lastSequence);