diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs
index 6e5535424..446b5c339 100644
--- a/TBF/BenchControl/Sequences/MainSeq.cs
+++ b/TBF/BenchControl/Sequences/MainSeq.cs
@@ -1435,6 +1435,10 @@ namespace TBF.BenchControl.Sequences
 
 							Compound = compound,
 							HeatMeter = heatMeters,
+#if ORACLE_DB
+                            WMTypeId = 0,       /// <--------------------------- TODO
+                            WMTypeRev = 0,
+#endif
 						};
 				}
 
diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
index c41b40781..35e417e38 100644
--- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
+++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
@@ -1965,7 +1965,10 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
 
         private void iPerlCommunicationForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            e.Cancel = true;
+            if ((e.CloseReason == CloseReason.UserClosing) && !checkBoxesEditMode)
+            {
+                e.Cancel = true;
+            }
         }
     }
 }