diff --git a/Aaru.CommonTypes b/Aaru.CommonTypes
index bc36f6518..846a1792f 160000
--- a/Aaru.CommonTypes
+++ b/Aaru.CommonTypes
@@ -1 +1 @@
-Subproject commit bc36f651805aca34acb4793ed4a468992ad3a5ff
+Subproject commit 846a1792f0fb9906305197e97a525f4d4b24e283
diff --git a/Aaru.Compression/TeleDiskLzh.cs b/Aaru.Compression/TeleDiskLzh.cs
index 7118e33a6..ed40e6021 100644
--- a/Aaru.Compression/TeleDiskLzh.cs
+++ b/Aaru.Compression/TeleDiskLzh.cs
@@ -169,12 +169,12 @@ public class TeleDiskLzh
     /// <returns>Number of decompressed bytes</returns>
     public int Decode(out byte[] buf, int len) /* Decoding/Uncompressing */
     {
-        short c;
         buf = new byte[len];
         int count; // was an unsigned long, seems unnecessary
 
         for(count = 0; count < len;)
         {
+            short c;
             if(_tdctl.Bufcnt == 0)
             {
                 if((c = DecodeChar()) < 0)
diff --git a/Aaru.Decoders b/Aaru.Decoders
index 85628a982..11131ce82 160000
--- a/Aaru.Decoders
+++ b/Aaru.Decoders
@@ -1 +1 @@
-Subproject commit 85628a982798cec90d9f7d97b4a0f4201b393a39
+Subproject commit 11131ce825fb6bcff73f50d71638559a79108438
diff --git a/Aaru.Decryption b/Aaru.Decryption
index 39d11a44c..24557e80c 160000
--- a/Aaru.Decryption
+++ b/Aaru.Decryption
@@ -1 +1 @@
-Subproject commit 39d11a44ca956bbcd168d69bf9734c9e598d0224
+Subproject commit 24557e80cdea503617d32d7d895ba040a443cf7b
diff --git a/Aaru.Images/ByteAddressable/NES.cs b/Aaru.Images/ByteAddressable/NES.cs
index 747585099..7fc7fbdb1 100644
--- a/Aaru.Images/ByteAddressable/NES.cs
+++ b/Aaru.Images/ByteAddressable/NES.cs
@@ -712,12 +712,11 @@ public class Nes : IByteAddressableImage
         var foundMapper    = false;
         var foundSubMapper = false;
 
-        Regex regex;
-        Match match;
-
         // Sanitize
         foreach(LinearMemoryDevice map in mappings.Devices)
         {
+            Regex regex;
+            Match match;
             switch(map.Type)
             {
                 case LinearMemoryType.ROM when !foundRom:
diff --git a/Aaru/Commands/Image/Decode.cs b/Aaru/Commands/Image/Decode.cs
index 4348a6961..3a4695382 100644
--- a/Aaru/Commands/Image/Decode.cs
+++ b/Aaru/Commands/Image/Decode.cs
@@ -184,7 +184,6 @@ sealed class DecodeCommand : Command
         Statistics.AddMediaFormat(inputFormat.Format);
         Statistics.AddMedia(inputFormat.Info.MediaType, false);
         Statistics.AddFilter(inputFilter.Name);
-        ErrorNumber errno;
 
         if(diskTags)
         {
@@ -194,6 +193,7 @@ sealed class DecodeCommand : Command
             {
                 foreach(MediaTagType tag in inputFormat.Info.ReadableMediaTags)
                 {
+                    ErrorNumber errno;
                     switch(tag)
                     {
                         case MediaTagType.SCSI_INQUIRY: