diff --git a/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs b/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs
index 9b14942c2..0379c3953 100644
--- a/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs
+++ b/TBF/Rig/TestMethods/SmartMeterFlyingStartMassCollection/SmartCommunicationSeq.cs
@@ -373,7 +373,7 @@ namespace TBF.Rig.TestMethods.SmartMeterFlyingStartMassCollection
                 /// Show the modeless dialog with error indication
                 ///
                 string componentName = (method as IComponent)?.Name ?? string.Empty;
-                Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, componentName, test, testParams });
+                Program.MainWnd.Invoke(new SmartCommFormDlgt(OpenSmartCommForm), new object[] { this, method, test, testParams });
 
                 //------------------------------------------------
                 Bridge.OnActivity(this, Strings.iPerl_Communication_in_progress);
diff --git a/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs b/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
index 1486c2df0..0ec158500 100644
--- a/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
+++ b/TBF/Rig/TestMethods/StandingStart/StandingStartSeq.cs
@@ -513,8 +513,8 @@ namespace TBF.Rig.TestMethods.StandingStart
 					{
 						GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
 						
-						if (rr is ISmartReader)
-							(rr as ISmartReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
+						if (rr is ICommonRegReader)
+							(rr as ICommonRegReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
 
 						if (rr is Rig.RegisterReaders.StandingStartStop.RegisterReader)
 							(rr as Rig.RegisterReaders.StandingStartStop.RegisterReader).BeginWMState = dataEntryCmpnt.WMStartState(i);
@@ -766,9 +766,9 @@ namespace TBF.Rig.TestMethods.StandingStart
                     for (int i = 0; i < Data.WMsCount; i++)
                     {
 						GenericDevices.IRegReader rr = sensPath.RegisterReaders[i];
-
-						if (rr is ISmartReader)
-							(rr as ISmartReader).EndWMState = dataEntryCmpnt.WMEndState(i);
+						
+						if (rr is ICommonRegReader)
+							(rr as ICommonRegReader).EndWMState = dataEntryCmpnt.WMEndState(i);
 						
 						if (rr is Rig.RegisterReaders.StandingStartStop.RegisterReader)
 							(rr as Rig.RegisterReaders.StandingStartStop.RegisterReader).EndWMState = dataEntryCmpnt.WMEndState(i);
@@ -1017,6 +1017,13 @@ namespace TBF.Rig.TestMethods.StandingStart
                                             && (tstRslt.ErrorFlags == 0);
                             meterRslt.TestDone = true;
                             tstRslt.TestDone = true;
+                            if (regReader is ICommonRegReader regReaderCommon)
+	                            // if (meterRslt.WaterMeter != null 
+	                            //     && tstRslt is ICommonRegReader tstRsltCommon 
+	                            //     && !string.IsNullOrEmpty(tstRsltCommon.SerialNr))
+                            {
+	                            meterRslt.WaterMeter.SerialNr = regReaderCommon.SerialNr;
+                            }
                         }
                     }
                 }