diff --git a/cluster/aws/templates/salt-master.sh b/cluster/aws/templates/salt-master.sh
index 7e50aec2d32..9851dac867f 100755
--- a/cluster/aws/templates/salt-master.sh
+++ b/cluster/aws/templates/salt-master.sh
@@ -27,7 +27,7 @@ EOF
 
 cat <<EOF > /etc/aws.conf
 [Global]
-Region:${AWS_ZONE}
+Region = ${AWS_ZONE}
 EOF
 
 # Auto accept all keys from minions that try to join
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index 7cb19991a21..22a76a452b0 100644
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -228,6 +228,11 @@ function kube-up {
     ssh-keygen -f $AWS_SSH_KEY -N ''
   fi
 
+  aws iam get-instance-profile --instance-profile-name ${IAM_PROFILE} || {
+        echo "You need to set up an IAM profile and role for kubernetes"
+        exit 1
+  }
+
   $AWS_CMD import-key-pair --key-name kubernetes --public-key-material file://$AWS_SSH_KEY.pub > $LOG 2>&1 || true
 
   VPC_ID=$($AWS_CMD describe-vpcs | get_vpc_id)
@@ -285,8 +290,8 @@ function kube-up {
     echo "cd /var/cache/kubernetes-install"
     echo "readonly MASTER_NAME='${MASTER_NAME}'"
     echo "readonly NODE_INSTANCE_PREFIX='${INSTANCE_PREFIX}-minion'"
-    echo "readonly SERVER_BINARY_TAR_URL='https://s3.amazonaws.com/${SERVER_BINARY_TAR_URL}'"
-    echo "readonly SALT_TAR_URL='https://s3.amazonaws.com/${SALT_TAR_URL}'"
+    echo "readonly SERVER_BINARY_TAR_URL='https://s3-${ZONE}.amazonaws.com/${SERVER_BINARY_TAR_URL}'"
+    echo "readonly SALT_TAR_URL='https://s3-${ZONE}.amazonaws.com/${SALT_TAR_URL}'"
     echo "readonly AWS_ZONE='${ZONE}'"
     echo "readonly MASTER_HTPASSWD='${htpasswd}'"
     echo "readonly PORTAL_NET='${PORTAL_NET}'"
diff --git a/cluster/saltbase/salt/kube-controller-manager/default b/cluster/saltbase/salt/kube-controller-manager/default
index 66e069ca0e2..03bdf1c571c 100644
--- a/cluster/saltbase/salt/kube-controller-manager/default
+++ b/cluster/saltbase/salt/kube-controller-manager/default
@@ -46,8 +46,4 @@
 {% endif -%}
 {% endif -%}
 
-<<<<<<< HEAD
-DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{pillar['log_level']}}"
-=======
-DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }}"
->>>>>>> 83f3982eee4d36962919d4f55a41ec1c2111d01a
+DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }} {{ cloud_config }} {{pillar['log_level']}}"