diff --git a/pillar/top.sls b/pillar/top.sls
index 1c3fb9635..e8bcabca3 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -45,7 +45,6 @@ base:
     - minions.adv_{{ grains.id }}
 
   '*_sensor':
-    - zeek.zeeklogs
     - healthcheck.sensor
     - soc_global
     - adv_global
@@ -53,7 +52,6 @@ base:
     - minions.adv_{{ grains.id }}
 
   '*_eval':
-    - zeel.zeeklogs
     - secrets
     - healthcheck.eval
     - elasticsearch.index_templates
@@ -82,7 +80,6 @@ base:
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/kibana/secrets.sls') %}
     - kibana.secrets
     {% endif %}
-    - zeek.zeeklogs
     - secrets
     - healthcheck.standalone
     - soc_global
@@ -94,7 +91,6 @@ base:
     - minions.adv_{{ grains.id }}
 
   '*_heavynode':
-    - zeek.zeeklogs
     - elasticsearch.auth
     - soc_global
     - minions.{{ grains.id }}
@@ -131,7 +127,6 @@ base:
     - minions.adv_{{ grains.id }}
 
   '*_import':
-    - zeek.zeeklogs
     - secrets
     - elasticsearch.index_templates
     {% if salt['file.file_exists']('/opt/so/saltstack/local/pillar/elasticsearch/auth.sls') %}
diff --git a/setup/so-functions b/setup/so-functions
index f0da78ba4..4954cb9cf 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -820,7 +820,7 @@ copy_salt_master_config() {
 		logCmd "cp /root/SecurityOnion/files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
 	else
 		logCmd "cp ../files/salt/master/master /etc/salt/master"
-		logCmd " ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
+		logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
 	fi
 
 	# Restart the service so it picks up the changes
@@ -2152,7 +2152,7 @@ set_default_log_size() {
 
 set_hostname() {
 
-	logCmd "hostnamectl set-hostname --static '$HOSTNAME'"
+	logCmd "hostnamectl set-hostname --static $HOSTNAME"
 	echo "127.0.0.1   $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost4 localhost4.localdomain" > /etc/hosts
 	echo "::1   $HOSTNAME $HOSTNAME.localdomain localhost localhost.localdomain localhost6 localhost6.localdomain6" >> /etc/hosts
 	echo "$HOSTNAME" > /etc/hostname