diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java
index d3992a37a7e..082067f0587 100755
--- a/core/src/com/cloud/resource/ServerResourceBase.java
+++ b/core/src/com/cloud/resource/ServerResourceBase.java
@@ -236,7 +236,7 @@ public abstract class ServerResourceBase implements ServerResource {
     }
 
     protected List<String> getWarnings() {
-        synchronized (this) {
+        synchronized (_warnings) {
             final ArrayList<String> results = _warnings;
             _warnings = new ArrayList<String>();
             return results;
@@ -244,7 +244,7 @@ public abstract class ServerResourceBase implements ServerResource {
     }
 
     protected List<String> getErrors() {
-        synchronized (this) {
+        synchronized (_errors) {
             final ArrayList<String> result = _errors;
             _errors = new ArrayList<String>();
             return result;
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index 7dd948a3493..847e0000e49 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -577,21 +577,6 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
         return attache;
     }
 
-    protected boolean notifyCreatorsOfConnection(StartupCommand[] cmd) throws ConnectionException {
-        boolean handled = false;
-        for (Pair<Integer, StartupCommandProcessor> monitor : _creationMonitors) {
-            if (s_logger.isDebugEnabled()) {
-                s_logger.debug("Sending Connect to creator: " + monitor.second().getClass().getSimpleName());
-            }
-            handled = monitor.second().processInitialConnect(cmd);
-            if (handled) {
-                break;
-            }
-        }
-
-        return handled;
-    }
-
     @Override
     public boolean start() {
         startDirectlyConnectedHosts();