diff --git a/Config/Entities/Procedure.cs b/Config/Entities/Procedure.cs
index e72f6876b..0b43ffb22 100644
--- a/Config/Entities/Procedure.cs
+++ b/Config/Entities/Procedure.cs
@@ -99,5 +99,10 @@ namespace Config.Entities
 
             return result;
         }
+
+		public override string ToString()
+		{
+			return string.Format("{0}, rev.{1}", Name, Revision);
+		}
     }
 }
diff --git a/Config/Entities/Test.cs b/Config/Entities/Test.cs
index 033e21ad4..b789976c0 100644
--- a/Config/Entities/Test.cs
+++ b/Config/Entities/Test.cs
@@ -117,5 +117,12 @@ namespace Config.Entities
 
             return result;
         }
+
+		public override string ToString()
+		{
+			string partStr = (Part > 0) ? string.Format(", part {0}", Part) : string.Empty;
+
+			return string.Format("{0}({1}{2}){3}", Name, Publish ? "P" : "-", Evaluate ? "E" : "-", partStr);
+		}
     }
 }
diff --git a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs
index ced73b1c3..11d27c21c 100644
--- a/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs
@@ -230,9 +230,10 @@ namespace TBF.BenchControl.DataEntry.iPerl
 					wm.PurchaseOrder = PurchaseOrder;
 
 					if (Sequences.SequenceBase.WaterMeters != null &&
-						Sequences.SequenceBase.WaterMeters.Count > wm.WMPosition)
+                        wm.WMPosition > 0 &&
+                        wm.WMPosition <= Sequences.SequenceBase.WaterMeters.Count)
 					{
-						WaterMeters.iPerl.WaterMeter iPerl = Sequences.SequenceBase.WaterMeters[wm.WMPosition] as WaterMeters.iPerl.WaterMeter;
+						WaterMeters.iPerl.WaterMeter iPerl = Sequences.SequenceBase.WaterMeters[wm.WMPosition - 1] as WaterMeters.iPerl.WaterMeter;
 						if (iPerl != null)
 						{
 #if IPERLST
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 880cbccc9..15aa56d36 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -88,7 +88,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
             //--------------------------------
 			State.Create("FlyingStart : Setting the flow")
 				.AddOperation(checkUiOp)
-				.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 600))    /// timeout = 10 min.
+				.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 990))    /// timeout = 16.5 min.
 				.EnterState();
 			do
 			{
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
index 4e3d75794..f90eb4d2f 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
@@ -143,7 +143,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
             //------------------------------------------------
 			State.Create("FlyingStartMassCollection : Setting the flow")
 				.AddOperation(checkUiOp)
-				.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 600))    /// timeout = 10 min.
+				.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, outPath.PidCoef, RefFlow, 990))    /// timeout = 16.5 min.
 				.EnterState();
 			do
 			{
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index e810ca3b7..4086bb4af 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.182.1")]
-[assembly: AssemblyFileVersion("2.1.182.1")]
+[assembly: AssemblyVersion("2.1.183.1")]
+[assembly: AssemblyFileVersion("2.1.183.1")]