diff --git a/pillar/top.sls b/pillar/top.sls
index 1884e0088..0701f4ac3 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -10,7 +10,7 @@ base:
     - masters.{{ grains.host }}
     - static
     - firewall.*
-    - data
+    - data.*
 
   'G@role:so-node':
     - nodes.schedule
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index ac1343db6..73b671fe9 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -78,7 +78,7 @@ so-kibana:
 # Keep the setting correct
 KibanaHappy:
   cmd.script:
-    shell: /bin/bash
-    runas: socore
-    source: salt://kibana/bin/keepkibanahappy.sh
-    template: jinja
+    - shell: /bin/bash
+    - runas: socore
+    - source: salt://kibana/bin/keepkibanahappy.sh
+    - template: jinja
diff --git a/salt/utility/init.sls b/salt/utility/init.sls
index c2a7799fa..43d46b2c6 100644
--- a/salt/utility/init.sls
+++ b/salt/utility/init.sls
@@ -4,7 +4,9 @@
 # Make sure Cross Cluster is good. Will need some logic once we have hot/warm
 crossclusterson:
   cmd.script:
-    shell: /bin/bash
-    runas: socore
-    source: salt://utility/bin/crossthestreams.sh
-    template: jinja
+    - shell: /bin/bash
+    - runas: socore
+    - source: salt://utility/bin/crossthestreams.sh
+    - template: jinja
+
+{% endif %}