diff --git a/salt/firewall/init.sls b/salt/firewall/init.sls
index b6c928eba..c27188f12 100644
--- a/salt/firewall/init.sls
+++ b/salt/firewall/init.sls
@@ -6,7 +6,8 @@
 {% elif grains['role'] == 'so-sensor' %}
   {% set ip = salt['pillar.get']('sensor:mainip', '') %}
 {% elif grains['role'] == 'so-fleet' %}
-  {% set ip = salt['pillar.get']('node:mainip', '') %}
+  {% set MAININT = salt['pillar.get']('host:mainint') %}
+  {% set ip = salt['grains.get']('ip_interfaces').get(MAININT)[0] %}
 {% endif %}
 
 {% set FLEET_NODE = salt['pillar.get']('static:fleet_node') %}
diff --git a/setup/so-functions b/setup/so-functions
index 3aea34bac..55cb71327 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -398,6 +398,9 @@ check_requirements() {
 		req_mem=12
 		req_cores=4
 		req_nics=2
+	elif [[ "$eval_or_dist" == 'fleet' ]]; then
+		req_mem=4
+		req_cores=4
 	elif [[ "$eval_or_dist" == 'dist' ]]; then
 		req_mem=8
 		req_cores=4
diff --git a/setup/so-setup b/setup/so-setup
index 313586800..f5d43eb38 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -138,6 +138,8 @@ if [[ $is_eval ]]; then
 	check_requirements "eval"
 elif [[ $is_distmaster || $is_minion ]]; then
 	check_requirements "dist"
+elif [[ $is_fleet_standalone ]]; then
+	check_requirements "fleet"
 elif [[ $is_sensor && ! $is_eval ]]; then
 	check_requirements "dist" "sensor"
 fi
@@ -284,7 +286,7 @@ if [[ $is_node && ! $is_eval ]]; then
 	fi
 fi
 
-if [ "$install_type" = 'FLEET' ]; then
+if [ "$install_type" == 'FLEET' ]; then
 	collect_fleetuser_inputs
 else
 	FLEETNODEUSER=$WEBUSER
diff --git a/setup/so-whiptail b/setup/so-whiptail
index 06712ace3..fc2429ad2 100755
--- a/setup/so-whiptail
+++ b/setup/so-whiptail
@@ -178,7 +178,7 @@ whiptail_create_fleet_node_user_password1() {
 
 	[ -n "$TESTING" ] && return
 
-	FLEETNODEPASS1=$(whiptail --title "Security Onion Install" --passwordbox \
+	FLEETNODEPASSWD1=$(whiptail --title "Security Onion Install" --passwordbox \
 	"Enter a password for $FLEETNODEUSER" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
@@ -189,7 +189,7 @@ whiptail_create_fleet_node_user_password2() {
 
 	[ -n "$TESTING" ] && return
 
-	FLEETNODEPASS2=$(whiptail --title "Security Onion Install" --passwordbox \
+	FLEETNODEPASSWD2=$(whiptail --title "Security Onion Install" --passwordbox \
 	"Re-enter a password for $FLEETNODEUSER" 10 60 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?