diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index 6934ef3de..78479d157 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit 6934ef3de3409eff749d1cd564686937968c704d
+Subproject commit 78479d1571b0c44077e7fe48a24e3a330918ac79
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
index be69c7133..338f25edc 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
@@ -32,7 +32,6 @@
 
 using System;
 using System.Linq;
-using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Structs;
@@ -94,7 +93,6 @@ namespace Aaru.Core.Devices.Dumping
             byte[]     senseBuf         = null;            // Sense buffer
             double     cmdDuration      = 0;               // Command execution time
             const uint sectorSize       = 2352;            // Full sector size
-            byte[]     tmpBuf;                             // Temporary buffer
             newTrim = false;
             PlextorSubchannel supportedPlextorSubchannel;
 
@@ -313,8 +311,8 @@ namespace Aaru.Core.Devices.Dumping
 
                             sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf,
                                                               (uint)(firstSectorToRead + r + adjustment), blockSize,
-                                                              (uint)sectorsForOffset + 1,
-                                                              supportedPlextorSubchannel, out cmdDuration);
+                                                              (uint)sectorsForOffset + 1, supportedPlextorSubchannel,
+                                                              out cmdDuration);
 
                             totalDuration += cmdDuration;
 
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
index 0573a82ae..c3c71ae9b 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
@@ -56,8 +56,7 @@ namespace Aaru.Core.Devices.Dumping
             byte[]            cmdBuf = null;     // Data buffer
             double            cmdDuration;       // Command execution time
             const uint        sectorSize = 2352; // Full sector size
-            byte[]            tmpBuf;            // Temporary buffer
-            byte[]            senseBuf = null;   // Sense buffer
+            byte[]            senseBuf   = null; // Sense buffer
             PlextorSubchannel supportedPlextorSubchannel;
 
             switch(supportedSubchannel)
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
index defe5efd0..b5e7973a8 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
@@ -55,7 +55,6 @@ namespace Aaru.Core.Devices.Dumping
             byte[]            cmdBuf      = null; // Data buffer
             double            cmdDuration = 0;    // Command execution time
             const uint        sectorSize  = 2352; // Full sector size
-            byte[]            tmpBuf;             // Temporary buffer
             PlextorSubchannel supportedPlextorSubchannel;
 
             switch(supportedSubchannel)
diff --git a/Aaru.Core/Logging/DumpLog.cs b/Aaru.Core/Logging/DumpLog.cs
index 013eab151..6ec0057cb 100644
--- a/Aaru.Core/Logging/DumpLog.cs
+++ b/Aaru.Core/Logging/DumpLog.cs
@@ -36,7 +36,6 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Interop;
 using Aaru.Devices;
-using Microsoft.EntityFrameworkCore.Internal;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = Aaru.CommonTypes.Interop.Version;
 
@@ -106,7 +105,7 @@ namespace Aaru.Core.Logging
                     }
                 }
 
-                logSw.WriteLine("Command line: {0}", args.Join(" "));
+                logSw.WriteLine("Command line: {0}", string.Join(" ", args));
             }
             else
                 logSw.WriteLine("Command line: {0}", Environment.CommandLine);
diff --git a/Aaru.Helpers b/Aaru.Helpers
index 5de0e8a5e..cd3fe08e0 160000
--- a/Aaru.Helpers
+++ b/Aaru.Helpers
@@ -1 +1 @@
-Subproject commit 5de0e8a5e7a22cfffec62366b97fce361a8b67b0
+Subproject commit cd3fe08e076225869c619009f33307a3f4eed390
diff --git a/Aaru.Images/UDIF/Read.cs b/Aaru.Images/UDIF/Read.cs
index 666ed1208..955c6863e 100644
--- a/Aaru.Images/UDIF/Read.cs
+++ b/Aaru.Images/UDIF/Read.cs
@@ -48,6 +48,8 @@ using SharpCompress.Compressors.ADC;
 using SharpCompress.Compressors.BZip2;
 using Version = Resources.Version;
 
+#pragma warning disable 612
+
 namespace Aaru.DiscImages
 {
     public partial class Udif
diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs
index 3985d0072..a789f8372 100644
--- a/Aaru/Commands/Database/Update.cs
+++ b/Aaru/Commands/Database/Update.cs
@@ -90,7 +90,7 @@ namespace Aaru.Commands
                     ctx.Database.Migrate();
                     ctx.SaveChanges();
                 }
-                catch(Exception e)
+                catch(Exception)
                 {
                     if(Debugger.IsAttached)
                         throw;
@@ -107,7 +107,7 @@ namespace Aaru.Commands
                 {
                     File.Delete(Settings.Settings.MasterDbPath);
                 }
-                catch(Exception e)
+                catch(Exception)
                 {
                     if(Debugger.IsAttached)
                         throw;