diff --git a/deploy.go b/deploy.go
index e488b34..cdc0e1d 100644
--- a/deploy.go
+++ b/deploy.go
@@ -608,7 +608,7 @@ func (gc *GatewayClient) BeginInstallation(jsonStr, mdmUsername, mdmPassword, li
 	u, _ := url.Parse(gc.host + "/im/types/Configuration/actions/install")
 	q := u.Query()
 
-	if gc.version == "4.0" {
+	if gc.version == "4.0" && !expansion {
 		q.Set("noSecurityBootstrap", "false")
 	} else {
 		q.Set("noUpload", "false")
@@ -994,7 +994,7 @@ func (gc *GatewayClient) CheckForCompletionQueueCommands(currentPhase string) (*
 
 	for _, mdmQueueCommandDetail := range mdmQueueCommandDetails {
 
-		if currentPhase == mdmQueueCommandDetail.AllowedPhase && mdmQueueCommandDetail.CommandState == "pending" {
+		if currentPhase == mdmQueueCommandDetail.AllowedPhase && (mdmQueueCommandDetail.CommandState == "pending" || mdmQueueCommandDetail.CommandState == "running") {
 			checkCompleted = "Running"
 			break
 		} else if currentPhase == mdmQueueCommandDetail.AllowedPhase && mdmQueueCommandDetail.CommandState == "failed" {