diff --git a/TBF/Rig/Generic/IDevice.cs b/TBF/Rig/Generic/IDevice.cs
index 90db60858..811381392 100644
--- a/TBF/Rig/Generic/IDevice.cs
+++ b/TBF/Rig/Generic/IDevice.cs
@@ -35,6 +35,9 @@ namespace TBF.Rig.Generic
         /// </summary>
         void StopDevice();
 
+        /// <summary>
+        /// Extra stop device function required by Camera only
+        /// </summary>
 		void StopDevice2();
 	}
 }
diff --git a/TBF/Rig/Modbus/Common/Modbus.cs b/TBF/Rig/Modbus/Common/Modbus.cs
index a54b06d8d..c05951c4e 100644
--- a/TBF/Rig/Modbus/Common/Modbus.cs
+++ b/TBF/Rig/Modbus/Common/Modbus.cs
@@ -326,10 +326,6 @@ namespace TBF.Rig.Modbus.Common
 
         /// <summary>Stop this device</summary>
         public void StopDevice()
-        {
-		}
-
-		public void StopDevice2()
         {
             if (serialPort != null)
             {
@@ -349,5 +345,7 @@ namespace TBF.Rig.Modbus.Common
                 serialPort = null;
             }
         }
+
+		public void StopDevice2() { }
 	}
 }
diff --git a/TBF/Rig/Modbus/Common/ModbusCfg.cs b/TBF/Rig/Modbus/Common/ModbusCfg.cs
index 9adb7d776..dabe7b3b0 100644
--- a/TBF/Rig/Modbus/Common/ModbusCfg.cs
+++ b/TBF/Rig/Modbus/Common/ModbusCfg.cs
@@ -10,7 +10,7 @@ using TBF.Rig.Generic;
 
 namespace TBF.Rig.Modbus.Common
 {
-    public class ModbusCfg : ComponentCfgBase, Generic.IComponentCfg, Config.Entities.IParamsProvider
+    public class ModbusCfg : ComponentCfgBase, IComponentCfg, Config.Entities.IParamsProvider
 	{
 		public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ModbusCfg) })[0];
 		public override XmlSerializer GetSerializer() { return Serializer; }