diff --git a/DiscImageChef.DiscImages/Alcohol120.cs b/DiscImageChef.DiscImages/Alcohol120.cs
new file mode 100644
index 000000000..4375ec710
--- /dev/null
+++ b/DiscImageChef.DiscImages/Alcohol120.cs
@@ -0,0 +1,42 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename       : Alcohol120.cs
+// Author(s)      : Natalia Portillo <claunia@claunia.com>
+//
+// Component      : Component
+//
+// --[ Description ] ----------------------------------------------------------
+//
+//     Description
+//
+// --[ License ] --------------------------------------------------------------
+//
+//     This library is free software; you can redistribute it and/or modify
+//     it under the terms of the GNU Lesser General Public License as
+//     published by the Free Software Foundation; either version 2.1 of the
+//     License, or (at your option) any later version.
+//
+//     This library is distributed in the hope that it will be useful, but
+//     WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+//     Lesser General Public License for more details.
+//
+//     You should have received a copy of the GNU Lesser General Public
+//     License along with this library; if not, see <http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2016 Natalia Portillo
+// ****************************************************************************/
+using System;
+namespace DiscImageChef.DiscImages
+{
+    public class Alcohol120
+    {
+        public Alcohol120()
+        {
+        }
+    }
+}
+
diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs
index 8a79ba7a9..5ff23d3fd 100644
--- a/DiscImageChef.DiscImages/CDRWin.cs
+++ b/DiscImageChef.DiscImages/CDRWin.cs
@@ -1802,8 +1802,8 @@ namespace DiscImageChef.ImagePlugins
                 case CDRWinTrackTypeCDG:
                     {
                         sector_offset = 0;
-                        sector_size = 2352;
-                        sector_skip = 96;
+                        sector_size = 2448;
+                        sector_skip = 0;
                         break;
                     }
                 default:
diff --git a/DiscImageChef.DiscImages/ChangeLog b/DiscImageChef.DiscImages/ChangeLog
index 8bfb83e2c..c6d7bee87 100644
--- a/DiscImageChef.DiscImages/ChangeLog
+++ b/DiscImageChef.DiscImages/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-09  Natalia Portillo  <claunia@claunia.com>
+
+	* CDRWin.cs: Corrected return of CD+G data, should return all
+	2448 bytes.
+
 2016-08-08  Natalia Portillo  <claunia@claunia.com>
 
 	* CDRDAO.cs: Corrected typo on audio track matching.
diff --git a/DiscImageChef.Partitions/AppleMap.cs b/DiscImageChef.Partitions/AppleMap.cs
index 5a437ba78..68c3fe18a 100644
--- a/DiscImageChef.Partitions/AppleMap.cs
+++ b/DiscImageChef.Partitions/AppleMap.cs
@@ -142,7 +142,11 @@ namespace DiscImageChef.PartPlugins
             for(ulong i = 0; i < apm_entries; i++) // For each partition
             {
                 if(APMFromHDDOnCD)
-                    APMEntry_sector = Read2048SectorAs512(imagePlugin, first_sector + i);
+                {
+                    return false;
+                    // TODO This needs several retesting
+                    // APMEntry_sector = Read2048SectorAs512(imagePlugin, first_sector + i);
+                }
                 else
                     APMEntry_sector = imagePlugin.ReadSector(first_sector + i);
 
diff --git a/DiscImageChef.Partitions/ChangeLog b/DiscImageChef.Partitions/ChangeLog
index ed744cb89..c9a2e13a8 100644
--- a/DiscImageChef.Partitions/ChangeLog
+++ b/DiscImageChef.Partitions/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-09  Natalia Portillo  <claunia@claunia.com>
+
+	* AppleMap.cs: Do not continue checking APM on CDs with
+	incorrect sector size. It is buggy and needs a lot of
+	retesting.
+
 2016-08-07  Natalia Portillo  <claunia@claunia.com>
 
 	* DiscImageChef.Partitions.csproj: Public beta release