diff --git a/salt/common/tools/sbin/so-allow b/salt/common/tools/sbin/so-allow
index c8f658052..146a4b644 100755
--- a/salt/common/tools/sbin/so-allow
+++ b/salt/common/tools/sbin/so-allow
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 # Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
 # or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
diff --git a/salt/common/tools/sbin/so-firewall b/salt/common/tools/sbin/so-firewall
index a15435665..0403f75c1 100755
--- a/salt/common/tools/sbin/so-firewall
+++ b/salt/common/tools/sbin/so-firewall
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/bash
 
 # Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
 # or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
@@ -71,6 +71,14 @@ else
 	exit 1
 fi
 
+# Are we dealing with an IP?
+if valid_ip4 "$IP"; then
+	echo "$IP is valid"
+else
+	echo "$IP is not a valid IP Address"
+	exit 1
+fi
+
 local_salt_dir=/opt/so/saltstack/local/salt/firewall
 
 # Let's see if the file exists and if it does, let's see if the IP exists.
diff --git a/salt/nginx/config/ssl.key b/salt/nginx/config/ssl.key
index 16878f704..909861578 100644
--- a/salt/nginx/config/ssl.key
+++ b/salt/nginx/config/ssl.key
@@ -1 +1 @@
-# Replace this text with the text from the .crt
\ No newline at end of file
+# Replace this text with the text from the .key
\ No newline at end of file
diff --git a/setup/so-variables b/setup/so-variables
index f29d9ae55..09f6cbd37 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -80,6 +80,9 @@ whiptail_title="Security Onion Setup - $SOVERSION"
 export whiptail_title
 
 mkdir -p $local_salt_dir/pillar/minions
+mkdir -p $local_salt_dir/salt/firewall/hostgroups
+mkdir -p $local_salt_dir/salt/firewall/portgroups
+mkdir -p $local_salt_dir/salt/firewall/ports
 
 for THEDIR in bpf pcap elasticsearch ntp firewall redis backup strelka sensoroni curator soc soctopus docker zeek suricata nginx filebeat logstash soc manager kratos idstools idh elastalert 
 do