diff --git a/Common/Hardware/WaterMeter/Genesis/Registers/RegisterConverter.cs b/Common/Hardware/WaterMeter/Genesis/Registers/RegisterConverter.cs
index 127e04ad..53c15709 100644
--- a/Common/Hardware/WaterMeter/Genesis/Registers/RegisterConverter.cs
+++ b/Common/Hardware/WaterMeter/Genesis/Registers/RegisterConverter.cs
@@ -17,6 +17,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.Registers
         public static Byte[] ConvertFrom<T>(T value)
         {
             var converted = new Byte[] {0};
+            if (value == null) return converted;
             if (value is UInt16)
             {
                 var tmp = Convert.ToUInt16(value);
diff --git a/Common/Ui/GenesisToolBox/FrmFwUpdate.Designer.cs b/Common/Ui/GenesisToolBox/FrmFwUpdate.Designer.cs
index adb9c4d9..d24b6c16 100644
--- a/Common/Ui/GenesisToolBox/FrmFwUpdate.Designer.cs
+++ b/Common/Ui/GenesisToolBox/FrmFwUpdate.Designer.cs
@@ -37,6 +37,7 @@
             this.label2 = new System.Windows.Forms.Label();
             this.cbComSlot = new System.Windows.Forms.ComboBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.btnRebootMeter = new System.Windows.Forms.Button();
             this.groupBox5 = new System.Windows.Forms.GroupBox();
             this.btnUploadConfig = new System.Windows.Forms.Button();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
@@ -109,7 +110,6 @@
             this.cbxFilterFWType = new System.Windows.Forms.ComboBox();
             this.chbFilterIsDeveloper = new System.Windows.Forms.CheckBox();
             this.saveConfigFile = new System.Windows.Forms.SaveFileDialog();
-            this.btnRebootMeter = new System.Windows.Forms.Button();
             this.grpSetup.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox5.SuspendLayout();
@@ -250,6 +250,16 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Applications ";
             // 
+            // btnRebootMeter
+            // 
+            this.btnRebootMeter.Location = new System.Drawing.Point(951, 476);
+            this.btnRebootMeter.Name = "btnRebootMeter";
+            this.btnRebootMeter.Size = new System.Drawing.Size(116, 25);
+            this.btnRebootMeter.TabIndex = 23;
+            this.btnRebootMeter.Text = "METER REBOOT";
+            this.btnRebootMeter.UseVisualStyleBackColor = true;
+            this.btnRebootMeter.Click += new System.EventHandler(this.btnRebootMeter_Click);
+            // 
             // groupBox5
             // 
             this.groupBox5.Controls.Add(this.btnUploadConfig);
@@ -329,6 +339,7 @@
             this.gbxManualTimingControl.TabIndex = 17;
             this.gbxManualTimingControl.TabStop = false;
             this.gbxManualTimingControl.Text = "Timing Control";
+            this.gbxManualTimingControl.Visible = false;
             // 
             // label8
             // 
@@ -428,6 +439,7 @@
             this.gbxManualUploadAndVerification.TabIndex = 15;
             this.gbxManualUploadAndVerification.TabStop = false;
             this.gbxManualUploadAndVerification.Text = "Manual Verification";
+            this.gbxManualUploadAndVerification.Visible = false;
             // 
             // btnVerifyFiles
             // 
@@ -478,7 +490,7 @@
             this.groupBox3.Size = new System.Drawing.Size(126, 49);
             this.groupBox3.TabIndex = 12;
             this.groupBox3.TabStop = false;
-            this.groupBox3.Text = "Automatic";
+            this.groupBox3.Text = "Execute";
             // 
             // btnUpdateFw
             // 
@@ -578,6 +590,7 @@
             this.cbxConsecutiveFilePartsRetryEnable.TabIndex = 23;
             this.cbxConsecutiveFilePartsRetryEnable.Text = "Retry Consecutive File Parts";
             this.cbxConsecutiveFilePartsRetryEnable.UseVisualStyleBackColor = true;
+            this.cbxConsecutiveFilePartsRetryEnable.Visible = false;
             this.cbxConsecutiveFilePartsRetryEnable.CheckedChanged += new System.EventHandler(this.cbxConsecutiveFilePartsRetryEnable_CheckedChanged);
             // 
             // label6
@@ -588,6 +601,7 @@
             this.label6.Size = new System.Drawing.Size(26, 13);
             this.label6.TabIndex = 22;
             this.label6.Text = "[kB]";
+            this.label6.Visible = false;
             // 
             // label5
             // 
@@ -597,6 +611,7 @@
             this.label5.Size = new System.Drawing.Size(73, 13);
             this.label5.TabIndex = 21;
             this.label5.Text = "File Part Sizes";
+            this.label5.Visible = false;
             // 
             // cbFilePartSize
             // 
@@ -614,6 +629,7 @@
             this.cbFilePartSize.Size = new System.Drawing.Size(44, 21);
             this.cbFilePartSize.TabIndex = 20;
             this.cbFilePartSize.Text = "2";
+            this.cbFilePartSize.Visible = false;
             // 
             // cbxSingleFilePartsRetryEnable
             // 
@@ -626,6 +642,7 @@
             this.cbxSingleFilePartsRetryEnable.TabIndex = 19;
             this.cbxSingleFilePartsRetryEnable.Text = "Retry Single File Parts";
             this.cbxSingleFilePartsRetryEnable.UseVisualStyleBackColor = true;
+            this.cbxSingleFilePartsRetryEnable.Visible = false;
             this.cbxSingleFilePartsRetryEnable.CheckedChanged += new System.EventHandler(this.cbxSingleFilePartsRetryEnable_CheckedChanged);
             // 
             // cbxManualControl
@@ -981,16 +998,6 @@
             // 
             this.saveConfigFile.Filter = "configuration file (*.hex)|*.hex";
             // 
-            // btnRebootMeter
-            // 
-            this.btnRebootMeter.Location = new System.Drawing.Point(951, 476);
-            this.btnRebootMeter.Name = "btnRebootMeter";
-            this.btnRebootMeter.Size = new System.Drawing.Size(116, 25);
-            this.btnRebootMeter.TabIndex = 23;
-            this.btnRebootMeter.Text = "METER REBOOT";
-            this.btnRebootMeter.UseVisualStyleBackColor = true;
-            this.btnRebootMeter.Click += new System.EventHandler(this.btnRebootMeter_Click);
-            // 
             // FrmFwUpdate
             // 
             this.AccessibleRole = System.Windows.Forms.AccessibleRole.Sound;
diff --git a/Common/Ui/GenesisToolBox/FrmFwUpdate.resx b/Common/Ui/GenesisToolBox/FrmFwUpdate.resx
index 23ab59ed..14eefb68 100644
--- a/Common/Ui/GenesisToolBox/FrmFwUpdate.resx
+++ b/Common/Ui/GenesisToolBox/FrmFwUpdate.resx
@@ -132,12 +132,6 @@
   <metadata name="tabDb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="tabProduction.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="tabDb.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="saveConfigFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>465, 17</value>
   </metadata>