diff --git a/server/src/main/java/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java
index 9abd3788764..f5eaf30510b 100644
--- a/server/src/main/java/com/cloud/api/ApiServer.java
+++ b/server/src/main/java/com/cloud/api/ApiServer.java
@@ -668,7 +668,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
     private String getBaseAsyncResponse(final long jobId, final BaseAsyncCmd cmd) {
         final AsyncJobResponse response = new AsyncJobResponse();
 
-        final AsyncJob job = entityMgr.findById(AsyncJob.class, jobId);
+        final AsyncJob job = entityMgr.findByIdIncludingRemoved(AsyncJob.class, jobId);
         response.setJobId(job.getUuid());
         response.setResponseName(cmd.getCommandName());
         return ApiResponseSerializer.toSerializedString(response, cmd.getResponseType());
@@ -676,7 +676,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
 
     private String getBaseAsyncCreateResponse(final long jobId, final BaseAsyncCreateCmd cmd, final String objectUuid) {
         final CreateCmdResponse response = new CreateCmdResponse();
-        final AsyncJob job = entityMgr.findById(AsyncJob.class, jobId);
+        final AsyncJob job = entityMgr.findByIdIncludingRemoved(AsyncJob.class, jobId);
         response.setJobId(job.getUuid());
         response.setId(objectUuid);
         response.setResponseName(cmd.getCommandName());
diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
index d9e0833b896..6416e3cadd7 100644
--- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
+++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
@@ -279,12 +279,15 @@ public class NetworkHelperImpl implements NetworkHelper {
         }
         final long dcid = router.getDataCenterId();
         String routerVersion = CloudStackVersion.trimRouterVersion(router.getTemplateVersion());
-        String currentCheckSum = ChecksumUtil.calculateCurrentChecksum(router.getName(), "vms/cloud-scripts.tgz");
         String routerChecksum = router.getScriptsVersion() == null ? "" : router.getScriptsVersion();
         boolean routerVersionMatch = CloudStackVersion.compare(routerVersion, NetworkOrchestrationService.MinVRVersion.valueIn(dcid)) >= 0;
         if (routerVersionMatch) {
             return true;
         }
+        if (HypervisorType.Simulator.equals(router.getHypervisorType())) {
+            return true;
+        }
+        String currentCheckSum = ChecksumUtil.calculateCurrentChecksum(router.getName(), "vms/cloud-scripts.tgz");
         boolean routerCheckSumMatch = currentCheckSum.equals(routerChecksum);
         return routerCheckSumMatch;
     }