diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index d419f608564..113e810faa5 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -33,11 +33,11 @@ updateResourceLimit=com.cloud.api.commands.UpdateResourceLimitCmd;3
 listResourceLimits=com.cloud.api.commands.ListResourceLimitsCmd;15
 
 #### VM commands
-deployVirtualMachine=com.cloud.api.commands.DeployVMCmd;11
+deployVirtualMachine=com.cloud.api.commands.DeployVm2Cmd;11
 destroyVirtualMachine=com.cloud.api.commands.DestroyVMCmd;15
 rebootVirtualMachine=com.cloud.api.commands.RebootVMCmd;15
-startVirtualMachine=com.cloud.api.commands.StartVMCmd;15
-stopVirtualMachine=com.cloud.api.commands.StopVMCmd;15
+startVirtualMachine=com.cloud.api.commands.StartVm2Cmd;15
+stopVirtualMachine=com.cloud.api.commands.StopVm2Cmd;15
 resetPasswordForVirtualMachine=com.cloud.api.commands.ResetVMPasswordCmd;15
 changeServiceForVirtualMachine=com.cloud.api.commands.UpgradeVMCmd;15
 updateVirtualMachine=com.cloud.api.commands.UpdateVMCmd;15
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 9c43f8ee6df..f4ca3d75be2 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -531,7 +531,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
     @Override
     public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) {
         try {
-            return start(proxyVmId, startEventId);
+            return start2(proxyVmId, startEventId);
         } catch (StorageUnavailableException e) {
             s_logger.warn("Exception while trying to start console proxy", e);
             return null;
@@ -887,7 +887,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance(dataCenterId);
+        Map<String, Object> context = createProxyInstance2(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {
@@ -927,7 +927,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
         if (s_logger.isDebugEnabled())
             s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId);
 
-        Map<String, Object> context = createProxyInstance(dataCenterId);
+        Map<String, Object> context = createProxyInstance2(dataCenterId);
 
         long proxyVmId = (Long) context.get("proxyVmId");
         if (proxyVmId == 0) {
@@ -1468,7 +1468,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach
                                 try {
                                     if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) {
                                         try {
-                                            readyProxy = start(readyProxy.getId(), 0);
+                                            readyProxy = start2(readyProxy.getId(), 0);
                                         } finally {
                                             proxyLock.unlock();
                                         }
diff --git a/server/src/com/cloud/vm/MauriceMoss.java b/server/src/com/cloud/vm/MauriceMoss.java
index 758753e2aa5..a34cb79ccc5 100644
--- a/server/src/com/cloud/vm/MauriceMoss.java
+++ b/server/src/com/cloud/vm/MauriceMoss.java
@@ -436,7 +436,6 @@ public class MauriceMoss implements VmManager, ClusterManagerListener {
         }
             
         vm.setReservationId(null);
-        vm.setHostId(null);
         _vmDao.updateIf(vm, Event.OperationSucceeded, null);
 
         if (cleanup) {