diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
index 12ebccb3c..40a6f2ef5 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -500,20 +500,21 @@ namespace Aaru.Core.Devices.Dumping
                    CanStoreSessions) &&
                sessions > 1)
             {
-                if(!_force)
-                {
-                    _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, not continuing...");
+                // TODO: Disabled until 6.0
+                /*if(!_force)
+                {*/
+                _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, not continuing...");
 
-                    StoppingErrorMessage?.
-                        Invoke("Output format does not support sessions, this will end in a loss of data, not continuing...");
+                StoppingErrorMessage?.
+                    Invoke("Output format does not support sessions, this will end in a loss of data, not continuing...");
 
-                    return;
-                }
+                return;
+                /*}
 
                 _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, continuing...");
 
                 ErrorMessage?.
-                    Invoke("Output format does not support sessions, this will end in a loss of data, continuing...");
+                    Invoke("Output format does not support sessions, this will end in a loss of data, continuing...");*/
             }
 
             // Check if output format supports all disc tags we have retrieved so far
@@ -556,8 +557,8 @@ namespace Aaru.Core.Devices.Dumping
             _dumpLog.WriteLine("Detecting disc type...");
             UpdateStatus?.Invoke("Detecting disc type...");
 
-            MMC.DetectDiscType(ref dskType, sessions, toc, _dev, out hiddenTrack, out hiddenData,
-                               firstTrackLastSession, blocks);
+            MMC.DetectDiscType(ref dskType, sessions, toc, _dev, out hiddenTrack, out hiddenData, firstTrackLastSession,
+                               blocks);
 
             if(hiddenTrack || firstLba > 0)
             {
@@ -1278,18 +1279,18 @@ namespace Aaru.Core.Devices.Dumping
             UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
 
             UpdateStatus?.
-                Invoke($"Average dump speed {(double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
 
             UpdateStatus?.
-                Invoke($"Average write speed {(double)blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
 
             _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
 
             _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               (double)blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
 
             _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               (double)blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
 
             TrimCdUserData(audioExtents, blockSize, currentTry, extents, newTrim, offsetBytes, read6, read10, read12,
                            read16, readcd, sectorsForOffset, subSize, supportedSubchannel, supportsLongSectors,
@@ -1438,7 +1439,7 @@ namespace Aaru.Core.Devices.Dumping
                 Invoke($"Took a total of {(end - dumpStart).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
 
             UpdateStatus?.
-                Invoke($"Average speed: {(double)blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
 
             if(maxSpeed > 0)
                 UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs
index 67062adaf..bf67ad499 100644
--- a/Aaru.Images/Alcohol120/Properties.cs
+++ b/Aaru.Images/Alcohol120/Properties.cs
@@ -45,12 +45,14 @@ namespace Aaru.DiscImages
         public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks  |
                                                                OpticalImageCapabilities.CanStoreDataTracks   |
                                                                OpticalImageCapabilities.CanStoreSubchannelRw |
-                                                               OpticalImageCapabilities.CanStoreSessions     |
-                                                               OpticalImageCapabilities.CanStoreIsrc         |
-                                                               OpticalImageCapabilities.CanStoreCdText       |
-                                                               OpticalImageCapabilities.CanStoreMcn          |
-                                                               OpticalImageCapabilities.CanStoreRawData      |
-                                                               OpticalImageCapabilities.CanStoreCookedData   |
+
+                                                               // TODO: Disabled until 6.0
+                                                               //OpticalImageCapabilities.CanStoreSessions     |
+                                                               OpticalImageCapabilities.CanStoreIsrc       |
+                                                               OpticalImageCapabilities.CanStoreCdText     |
+                                                               OpticalImageCapabilities.CanStoreMcn        |
+                                                               OpticalImageCapabilities.CanStoreRawData    |
+                                                               OpticalImageCapabilities.CanStoreCookedData |
                                                                OpticalImageCapabilities.CanStoreMultipleTracks;
         public ImageInfo Info   => _imageInfo;
         public string    Name   => "Alcohol 120% Media Descriptor Structure";
diff --git a/Aaru.Images/CloneCD/Properties.cs b/Aaru.Images/CloneCD/Properties.cs
index 7289146a2..7fb7fefab 100644
--- a/Aaru.Images/CloneCD/Properties.cs
+++ b/Aaru.Images/CloneCD/Properties.cs
@@ -45,12 +45,14 @@ namespace Aaru.DiscImages
                                                                OpticalImageCapabilities.CanStoreDataTracks   |
                                                                OpticalImageCapabilities.CanStorePregaps      |
                                                                OpticalImageCapabilities.CanStoreSubchannelRw |
-                                                               OpticalImageCapabilities.CanStoreSessions     |
-                                                               OpticalImageCapabilities.CanStoreIsrc         |
-                                                               OpticalImageCapabilities.CanStoreCdText       |
-                                                               OpticalImageCapabilities.CanStoreMcn          |
-                                                               OpticalImageCapabilities.CanStoreRawData      |
-                                                               OpticalImageCapabilities.CanStoreCookedData   |
+
+                                                               // TODO: Disabled until 6.0
+                                                               //OpticalImageCapabilities.CanStoreSessions     |
+                                                               OpticalImageCapabilities.CanStoreIsrc       |
+                                                               OpticalImageCapabilities.CanStoreCdText     |
+                                                               OpticalImageCapabilities.CanStoreMcn        |
+                                                               OpticalImageCapabilities.CanStoreRawData    |
+                                                               OpticalImageCapabilities.CanStoreCookedData |
                                                                OpticalImageCapabilities.CanStoreMultipleTracks;
         public ImageInfo              Info         => _imageInfo;
         public string                 Name         => "CloneCD";