diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons
index 50dad3b9d..21f204e58 100755
--- a/xCAT-client/bin/rcons
+++ b/xCAT-client/bin/rcons
@@ -75,8 +75,15 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/
     fi
     if [ -z "$CONSERVER" ]; then
         CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '`
+        declare -a ipaddrs=`ip addr | grep 'inet' | awk {'print $2'} | cut -d/ -f1 | grep -v : | tr '\n' ' '`
+        for IP in ${ipaddrs[*]}; do 
+            if [[ "${CONSERVER}" == "${IP}" ]]; then 
+                # conserver is the same node, do not connect using -s
+                CONSERVER=""
+                break
+            fi
+        done
     fi
-    
     if [ -z "$CONSERVER" ]; then
 	CONSERVER=$XCATHOST
     fi
diff --git a/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh b/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh
index 5b3a3cc65..90f6efac6 100755
--- a/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh
+++ b/xCAT-confluent/confluent/lib/python/confluent/plugins/console/xcathmc.sh
@@ -1,2 +1,9 @@
 #!/bin/bash
+# export XCATSSLVER for SLES 11.  Other OS can work without this setting.
+if [ -r /etc/SuSE-release ]; then
+  ver=`grep 'VERSION' /etc/SuSE-release | awk -F= '{print $2}' | sed 's/ //g'`
+  if [ "$ver" = "11" ]; then
+    export XCATSSLVER=TLSv1
+  fi
+fi
 exec /opt/xcat/share/xcat/cons/hmc $CONFLUENT_NODE