diff --git a/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs b/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs
index e9e9f1f..ecf6db8 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/EventArgs.cs	
@@ -76,6 +76,14 @@ namespace PepperDash.Core
     public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
     {
         public uint ReceivedFromClientIndex { get; private set; }
+		public ushort ReceivedFromClientIndexShort
+		{
+			get
+			{
+				return (ushort)ReceivedFromClientIndex;
+			}
+		}
+
         public string Text { get; private set; }
 
         public GenericTcpServerCommMethodReceiveTextArgs(string text)
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs
index 6af5d7b..8a6e9fd 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericSshClient.cs	
@@ -221,7 +221,12 @@ namespace PepperDash.Core
 
 			Debug.Console(1, this, "Creating new SshClient");
 			ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-			Client = new SshClient(connectionInfo);
+
+			if (Client == null)
+			{
+				Client = new SshClient(connectionInfo);
+			}
+			Client.ErrorOccurred -= Client_ErrorOccurred;
 			Client.ErrorOccurred += Client_ErrorOccurred;
 
 			//You can do it!
diff --git a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs
index 525f32b..e9a7ccf 100644
--- a/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
+++ b/Pepperdash Core/Pepperdash Core/Comm/GenericTcpIpClient.cs	
@@ -250,8 +250,6 @@ namespace PepperDash.Core
 
             if (Client == null)
             {
-			
-				
                 Client = new TCPClient(Hostname, Port, BufferSize);
                 Client.SocketStatusChange += Client_SocketStatusChange;
             }