diff --git a/DiscImageChef/ChangeLog b/DiscImageChef/ChangeLog
index 3d4d3f25..f3db09e2 100644
--- a/DiscImageChef/ChangeLog
+++ b/DiscImageChef/ChangeLog
@@ -1,20 +1,5 @@
-* Main.cs:
-  Submit pending statistics on bootup.
-
-* Commands/Statistics.cs:
-  Call to statistics from metadata.
-
 * Commands/DeviceReport.cs:
-  Added code to submit statistics.
-
-* ChangeLog:
-  
-
-* ChangeLog:
-  
-
-* DiscImageChef.csproj:
-  Project file formatting.
+  Don't generate report files with '/', '\\' or '?' characters.
 
 2017-05-28  Natalia Portillo  <claunia@claunia.com>
 
diff --git a/DiscImageChef/Commands/DeviceReport.cs b/DiscImageChef/Commands/DeviceReport.cs
index cf7bc9e9..3e38c33a 100644
--- a/DiscImageChef/Commands/DeviceReport.cs
+++ b/DiscImageChef/Commands/DeviceReport.cs
@@ -80,6 +80,8 @@ namespace DiscImageChef.Commands
             else
                 xmlFile = dev.Model + ".xml";
 
+            xmlFile = xmlFile.Replace('\\', '_').Replace('/', '_').Replace('?', '_');
+
             switch(dev.Type)
             {
                 case DeviceType.ATA:
@@ -87,10 +89,10 @@ namespace DiscImageChef.Commands
                     break;
                 case DeviceType.MMC:
                 case DeviceType.SecureDigital:
-                    Core.Devices.Report.ATA.Report(dev, ref report, options.Debug, ref removable);
+                    Core.Devices.Report.SecureDigital.Report(dev, ref report, options.Debug, ref removable);
                     break;
                 case DeviceType.NVMe:
-                    Core.Devices.Report.ATA.Report(dev, ref report, options.Debug, ref removable);
+                    Core.Devices.Report.NVMe.Report(dev, ref report, options.Debug, ref removable);
                     break;
                 case DeviceType.ATAPI:
                 case DeviceType.SCSI: