diff --git a/mysql-ha-pxc-zones/azuredeploy.json b/mysql-ha-pxc-zones/azuredeploy.json
index af737e9a562a..dded1df34c6c 100644
--- a/mysql-ha-pxc-zones/azuredeploy.json
+++ b/mysql-ha-pxc-zones/azuredeploy.json
@@ -201,7 +201,8 @@
       "name": "[concat('nic-', copyIndex(1))]",
       "location": "[parameters('location')]",
       "dependsOn": [
-        "[parameters('virtualNetworkName')]"
+        "[parameters('virtualNetworkName')]",
+        "pipLoop"
       ],
       "copy": {
         "name": "nicLoop",
@@ -326,15 +327,5 @@
         }
       ]
     }
-  ],
-  "outputs": {
-    "ipAddresses": {
-      "type": "array",
-      "value": [
-        "[reference(concat(variables('publicIpAddressName'), 0)).ipAddress]",
-        "[reference(concat(variables('publicIpAddressName'), 1)).ipAddress]",
-        "[reference(concat(variables('publicIpAddressName'), 2)).ipAddress]"
-      ]
-    }
-  }
+  ]
 }
\ No newline at end of file
diff --git a/mysql-ha-pxc-zones/azuredeploy.parameters.json b/mysql-ha-pxc-zones/azuredeploy.parameters.json
index d62290c7a5b2..19096ca3baca 100644
--- a/mysql-ha-pxc-zones/azuredeploy.parameters.json
+++ b/mysql-ha-pxc-zones/azuredeploy.parameters.json
@@ -2,10 +2,10 @@
   "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
   "parameters": {
-    "userName": {
+    "adminUsername": {
       "value": "GEN-UNIQUE"
     },
-    "password": {
+    "adminPassword": {
       "value": "GEN-PASSWORD"
     }
   }
diff --git a/mysql-ha-pxc-zones/metadata.json b/mysql-ha-pxc-zones/metadata.json
index 728d64be9e74..acb3d611b22b 100644
--- a/mysql-ha-pxc-zones/metadata.json
+++ b/mysql-ha-pxc-zones/metadata.json
@@ -1,5 +1,5 @@
 {
-  "itemDisplayName": "Deploys a 3 node Percona XtraDB Cluster in Availability Zones",
+  "itemDisplayName": "Deploy a 3 node Percona XtraDB Cluster in Availability Zones",
   "description": "This template deploys a 3 node MySQL high availability cluster on CentOS 6.5 or Ubuntu 12.04",
   "summary": "Deploys a 3 node MySQL PXC with stripped disks",
   "githubUsername": "aaronlower",