diff --git a/server/src/com/cloud/cluster/ClusterManagerImpl.java b/server/src/com/cloud/cluster/ClusterManagerImpl.java
index 9bab3dae098..c55ee8c2b04 100644
--- a/server/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/server/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -574,7 +574,7 @@ public class ClusterManagerImpl implements ClusterManager {
 			return _heartbeatConnection;
 		}
 		
-		_heartbeatConnection = Transaction.getStandaloneUsageConnection();
+		_heartbeatConnection = Transaction.getStandaloneConnection();
 		return _heartbeatConnection;
 	}
 	
diff --git a/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java b/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java
index 0933f2d1789..442cf691913 100644
--- a/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java
+++ b/server/src/com/cloud/cluster/dao/ManagementServerHostDaoImpl.java
@@ -57,6 +57,7 @@ public class ManagementServerHostDaoImpl extends GenericDaoBase<ManagementServer
             pstmt.setLong(6, id);
             
             pstmt.executeUpdate();
+            conn.commit();
         } catch(SQLException e ) {
         	throw new CloudRuntimeException("DB exception on " + pstmt.toString(), e);
         } finally {
@@ -78,6 +79,7 @@ public class ManagementServerHostDaoImpl extends GenericDaoBase<ManagementServer
             pstmt.setLong(2, id);
             
             pstmt.executeUpdate();
+            conn.commit();
         } catch (SQLException e) { 
         	throw new CloudRuntimeException("DB exception on " + pstmt.toString(), e);
         } finally {
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
index 73f74ddec1e..26d71bc1d2a 100755
--- a/utils/src/com/cloud/utils/db/Transaction.java
+++ b/utils/src/com/cloud/utils/db/Transaction.java
@@ -549,8 +549,10 @@ public class Transaction {
             cleanup();
         }
         
-        tls.set(_prev);
-        _prev = null;
+        if(this._dbId == CONNECTED_DB) {
+	        tls.set(_prev);
+	        _prev = null;
+        }
     }
     
     /**