diff --git a/so-setup-network.sh b/so-setup-network.sh
index f32ef5efe..eef4c17ff 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -18,7 +18,7 @@
 # Global Variable Section
 HOSTNAME=$(cat /etc/hostname)
 TOTAL_MEM=`grep MemTotal /proc/meminfo | awk '{print $2}' | sed -r 's/.{3}$//'`
-NICS=$(ip link | awk -F: '$0 !~ "lo|vir|veth|br|docker|wl|^[^0-9]"{print $2 " \"" "Interface" "\"" " OFF"}')
+NICS=$(ip link | awk -F: '$0 !~ "lo|vir|veth|br|docker|wl|bond|^[^0-9]"{print $2 " \"" "Interface" "\"" " OFF"}')
 CPUCORES=$(cat /proc/cpuinfo | grep processor | wc -l)
 LISTCORES=$(cat /proc/cpuinfo | grep processor | awk '{print $3 " \"" "core" "\""}')
 RANDOMUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)
@@ -151,6 +151,15 @@ chown_salt_master() {
 
 }
 
+clear_master() {
+  # Clear out the old master public key in case this is a re-install.
+  # This only happens if you re-install the master.
+  if [ -f /etc/salt/pki/minion/minion_master.pub]; then
+    rm /etc/salt/pki/minion/minion_master.pub
+  fi
+
+}
+
 configure_minion() {
 
   # You have to pass the TYPE to this function so it knows if its a master or not
@@ -372,7 +381,7 @@ es_heapsize() {
 filter_nics() {
 
   # Filter the NICs that we don't want to see in setup
-  FNICS=$(ip link | grep -vw $MNIC | awk -F: '$0 !~ "lo|vir|veth|br|docker|wl|^[^0-9]"{print $2 " \"" "Interface" "\"" " OFF"}')
+  FNICS=$(ip link | grep -vw $MNIC | awk -F: '$0 !~ "lo|vir|veth|br|docker|wl|bond|^[^0-9]"{print $2 " \"" "Interface" "\"" " OFF"}')
 
 }
 get_filesystem_nsm(){
@@ -1336,6 +1345,7 @@ if (whiptail_you_sure); then
 
     # Last Chance to back out
     whiptail_make_changes
+    clear_master
     mkdir -p /nsm
     get_filesystem_root
     get_filesystem_nsm
@@ -1433,6 +1443,7 @@ if (whiptail_you_sure); then
       whiptail_basic_suri
     fi
     whiptail_make_changes
+    clear_master
     mkdir -p /nsm
     get_filesystem_root
     get_filesystem_nsm
@@ -1487,6 +1498,7 @@ if (whiptail_you_sure); then
     NIDS=Suricata
     BROVERSION=COMMUNITY
     whiptail_make_changes
+    clear_master
     mkdir -p /nsm
     get_filesystem_root
     get_filesystem_nsm
@@ -1549,6 +1561,7 @@ if (whiptail_you_sure); then
       LSINPUTBATCHCOUNT=125
     fi
     whiptail_make_changes
+    clear_master
     mkdir -p /nsm
     get_filesystem_root
     get_filesystem_nsm