diff --git a/hooks/blueprint b/hooks/blueprint
index f53bcf5a..325ac951 100755
--- a/hooks/blueprint
+++ b/hooks/blueprint
@@ -127,6 +127,13 @@ for want in "${features[@]}"; do
       "          Please replace it with the #c{haproxy} and #c{tls} flags."
     renamed_features+=( "haproxy" "tls" )
     ;;
+  haproxy-self-signed)
+    warn=1
+    describe >&2 \
+      "#Y{[WARNING]} The #c{haproxy-self-signed} feature flag has been deprecated." \
+      "          Please replace it with the #c{haproxy} and #c{self-signed} flags."
+    renamed_features+=( "haproxy" "self-signed" )
+    ;;    
   haproxy-notls)
     warn=1
     describe >&2 \
@@ -192,7 +199,7 @@ validate_features container-routing-integrity \
                   bare \
                   haproxy tls self-signed \
                   aws-blobstore azure-blobstore gcp-blobstore gcp-use-access-key \
-                  local-postgres-db local-mysql-db mysql-db posgtres-db \
+                  local-postgres-db local-mysql-db mysql-db postgres-db \
                   nfs-volume-services small-footprint \
                   app-autoscaler-integration
 
@@ -241,13 +248,13 @@ for want in ${GENESIS_REQUESTED_FEATURES}; do
       manifest+=( \
         "overlay/blobstore/external.yml" \
         "cf-deployment/operations/use-external-blobstore.yml" \
-        "use-gcs-blobstore-access-key.yml" \
+        "cf-deployment/operations/use-gcs-blobstore-access-key.yml" \
       )
     else
       manifest+=( \
         "overlay/blobstore/external.yml" \
         "cf-deployment/operations/use-external-blobstore.yml" \
-        "use-gcs-blobstore-service-account.yml" \
+        "cf-deployment/operations/use-gcs-blobstore-service-account.yml" \
       )
     fi
     ;;
@@ -265,8 +272,8 @@ for want in ${GENESIS_REQUESTED_FEATURES}; do
   mysql-db|postgres-db)
     database=$(( database + 1 ))
     manifest+=( \
-      "cf-deployment/operations/use-external-db.yml" \
-      "operations/use-external-db-ports.yml" \
+      "cf-deployment/operations/use-external-dbs.yml" \
+      "operations/use-external-dbs-ports.yml" \
       "overlay/db/external.yml" \
       "overlay/db/external-${want%-db}.yml" \
     )
@@ -299,7 +306,7 @@ fi
 
 if want_feature haproxy; then
   manifest+=( "overlay/routing/haproxy.yml" )
-  if [[ -n "$(lookup 'params.cf_lb_network' "")" ]]; then
+  if [[ -n "$(lookup 'params.cf_lb_network' "")" ]]; then #TODO: ??
     manifest+=( "overlay/routing/haproxy-public-network.yml" )
   fi
   if want_feature "tls"; then
diff --git a/overlay/db/external_mysql.yml b/overlay/db/external-mysql.yml
similarity index 100%
rename from overlay/db/external_mysql.yml
rename to overlay/db/external-mysql.yml
diff --git a/overlay/db/external_postgres.yml b/overlay/db/external-postgres.yml
similarity index 100%
rename from overlay/db/external_postgres.yml
rename to overlay/db/external-postgres.yml
diff --git a/overlay/routing/haproxy.yml b/overlay/routing/haproxy.yml
index 713cfeac..d071185c 100644
--- a/overlay/routing/haproxy.yml
+++ b/overlay/routing/haproxy.yml
@@ -20,7 +20,7 @@ instance_groups:
   - name: haproxy
     instances: (( grab params.haproxy_instances ))
     vm_type:   (( grab params.haproxy_vm_type ))
-    azs:       (( grab params.availability_zones || meta.default.azs ))
+    azs:       (( grab params.availability_zones || meta.default_azs ))
 
     stemcell: default
     networks: