diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index fc163d7e6db..022ba79a5ea 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4080,8 +4080,6 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
                 s_logger.warn(msg);
                 return new Answer(cmd, false, msg);
             }
-            sr.setNameLabel(conn, pool.getUuid());
-            sr.setNameDescription(conn, pool.getName());
             long capacity = sr.getPhysicalSize(conn);
             long available = capacity - sr.getPhysicalUtilisation(conn);
             if (capacity == -1) {
diff --git a/scripts/vm/hypervisor/xenserver/hostvmstats.py b/scripts/vm/hypervisor/xenserver/hostvmstats.py
index 7e7d9869945..8b84da70e36 100644
--- a/scripts/vm/hypervisor/xenserver/hostvmstats.py
+++ b/scripts/vm/hypervisor/xenserver/hostvmstats.py
@@ -12,14 +12,14 @@ def get_stats(session, collect_host_stats, consolidation_function, interval, sta
     
     if collect_host_stats == "true" :
     	url = "http://localhost/rrd_updates?"
-   	url += "session_id=" + session
+   	url += "session_id=" + session._session
    	url += "&host=" + collect_host_stats
     	url += "&cf=" + consolidation_function
     	url += "&interval=" + str(interval)
     	url += "&start=" + str(int(time.time())-100)
     else :
     	url = "http://localhost/rrd_updates?"
-   	url += "session_id=" + session
+   	url += "session_id=" + session._session
    	url += "&host=" + collect_host_stats
     	url += "&cf=" + consolidation_function
     	url += "&interval=" + str(interval)
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index cf5b7cd9929..836679ccb8c 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -41,9 +41,9 @@ def echo(fn):
 
 
 def get_xapi_session():
-    xapi = XenAPI.xapi_local();
-    xapi.login_with_password("","")
-    return xapi._session
+    session = XenAPI.xapi_local();
+    session.login_with_password("","")
+    return session
 
 @echo
 def gethostvmstats(session, args):
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index 156b5a16366..2ede998d5b8 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -20,10 +20,11 @@ nfs.py=/opt/xensource/sm
 iptables=/etc/sysconfig
 patch.tgz=..,0775,/opt/xensource/bin
 vmops=..,0755,/etc/xapi.d/plugins
-systemvm-premium.zip=../../../../../vms,0755,/opt/xensource/bin
+systemvm.zip=../../../../../vms,0755,/opt/xensource/bin
 hostvmstats.py=..,0755,/opt/xensource/sm
 network_info.sh=..,0755,/opt/xensource/bin
 prepsystemvm.sh=..,0755,/opt/xensource/bin
+setupxenserver.sh=..,0755,/opt/xensource/bin
 make_migratable.sh=..,0755,/opt/xensource/bin
 networkUsage.sh=..,0755,/opt/xensource/bin
 setup_iscsi.sh=..,0755,/opt/xensource/bin