diff --git a/.gitignore b/.gitignore
index 032a9e806ef..81eba9119a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,15 @@
 build/build.number
 bin/
-cloudstack-proprietary
+cloudstack-proprietary/
+premium/
 .lock-wscript
-artifacts
+artifacts/
 .waf-*
 waf-*
-target
+target/
 override/
 .metadata
-dist
+dist/
 *~
 *.bak
 cloud-*.tar.bz2
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index 84614d8f888..4dfb57dcca8 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -269,7 +269,7 @@ public class XenServerConnectionPool {
             try {
                 slaveConn = new Connection(new URL("http://" + slaveAddress), wait);
                 if (slaveConn != null) {
-                    Session slaveSession = Session.slaveLocalLoginWithPassword(slaveConn, username, password);
+                    Session.slaveLocalLoginWithPassword(slaveConn, username, password);
                     Pool.Record slavePoolr = getPoolRecord(slaveConn);
                     String possibleMaster = slavePoolr.master.getAddress(slaveConn);
                     Integer c = count.get(possibleMaster);
@@ -280,7 +280,7 @@ public class XenServerConnectionPool {
                     }
                     count.put(possibleMaster, c);
                     try {
-                        slaveSession.logout(slaveConn);
+                        Session.logout(slaveConn);
                     } catch (Exception e) {
                         s_logger.debug("client session logout: " + e.getMessage());
                     }