diff --git a/xCAT-nbroot2/bmcsetup b/xCAT-nbroot2/bmcsetup
index 816385bb1..6dad96b2f 100755
--- a/xCAT-nbroot2/bmcsetup
+++ b/xCAT-nbroot2/bmcsetup
@@ -280,12 +280,6 @@ if [ ! "$IPMIVER" == "1.5"  ]; then
     fi
 	
 	
-    while ! ipmitool -d $idev lan set $LANCHAN cipher_privs $PRIVS > /dev/null; do
-        sleep 1
-        let TRIES=TRIES+1
-    if [ $TRIES -gt $TIMEOUT ]; then break; fi
-    done
-    if [ $TRIES -gt $TIMEOUT ]; then echo "ERROR"; else echo "OK"; fi
     TRIES=0
 
     echo -n "Enabling SOL for channel $LANCHAN:"
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 1d67a0de4..817f8cc52 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -520,7 +520,7 @@ sleep 0.05;
           $req->{'_xcat_clientip'}=inet_ntoa($client);
           $req->{'_xcat_clientport'}=$sport;
           if (defined($cmd_handlers{"findme"}) and xCAT::Utils->nodeonmynet(inet_ntoa($client))) { #only discover from ips that appear to be on a managed network
-            xCAT::MsgUtils->message("S","xcatd: Processing discovery request from ".$req->{'_clientip'});
+            xCAT::MsgUtils->message("S","xcatd: Processing discovery request from ".$req->{'_xcat_clientip'});
             $req->{cacheonly}->[0] = 1;
             plugin_command($req,undef,\&build_response);
   	    if ($req->{cacheonly}->[0]) {