diff --git a/Common/Ui/LegacyGenesisControl/ctlBatch.cs b/Common/Ui/LegacyGenesisControl/ctlBatch.cs
index 3bca3e05..008340fd 100644
--- a/Common/Ui/LegacyGenesisControl/ctlBatch.cs
+++ b/Common/Ui/LegacyGenesisControl/ctlBatch.cs
@@ -1935,6 +1935,7 @@ namespace XylemCommonUiLegacyGenCtl
 
                 var t = new Task(() =>
                 {
+                    // ReSharper disable once CoVariantArrayConversion
                     Task.WaitAll(taskList.ToArray());
 
                     Boolean overallResult = true;
@@ -2047,7 +2048,10 @@ namespace XylemCommonUiLegacyGenCtl
             var text = "-";
             if (!double.IsNaN(Value))
             {
-                text = string.Format("{{0:N" + digits + "}}", Value);
+                // ReSharper disable once FormatStringProblem
+                text = string.Format("{0:N" + digits +
+                                     // ReSharper disable once FormatStringProblem
+                                     "}", Value);
             }
             return text;
 
@@ -2102,16 +2106,16 @@ namespace XylemCommonUiLegacyGenCtl
         public String GetVersion()
         {
             var taskList = new List<Task<Boolean>>();
-            foreach (var basemeter in batch.ListOfMeters)
+            foreach (var baseMeter in batch.ListOfMeters)
             {
-                if (basemeter is GenesisMeter)
+                if (baseMeter is GenesisMeter)
                 {
 
                     var calibrationTask = new Task<Boolean>(() =>
                     {
                         try
                         {
-                            var genesis = (GenesisMeter)basemeter;
+                            var genesis = (GenesisMeter)baseMeter;
                             genesis.PushProgress("LegacyGenCtl", Assembly.GetExecutingAssembly().GetName().Version.ToString());
                             return true;
                         }
@@ -2131,6 +2135,7 @@ namespace XylemCommonUiLegacyGenCtl
 
             if (taskList.Count > 0)
             {
+                // ReSharper disable once CoVariantArrayConversion
                 Task.WaitAll(taskList.ToArray());
             }
 
@@ -2142,7 +2147,7 @@ namespace XylemCommonUiLegacyGenCtl
         {
             if (vbContainer is TestSetupContainer container)
             {
-                StringBuilder sb = new StringBuilder();
+                var sb = new StringBuilder();
 
                 sb.AppendLine($"WatingForDecision={container.WatingForDecision}");
                 sb.AppendLine($"TempSouce={container.TempSouce}");