diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli
index c736bc6e0..7bb3792ea 100644
--- a/Shorewall-core/lib.cli
+++ b/Shorewall-core/lib.cli
@@ -4040,10 +4040,6 @@ shorewall_cli() {
 
     [ -n "${VARDIR:=/var/lib/$g_program}" ]
 
-    if [ ! -f ${VARDIR}/firewall ]; then
-	[ -f ${VARDIR}/.restore ] && cp -f ${VARDIR}/.rstore ${VARDIR}/firewall
-    fi
-
     g_firewall=${VARDIR}/firewall
 
     version_file=${g_sharedir}/version
diff --git a/Shorewall-init/shorewall-init.service b/Shorewall-init/shorewall-init.service
index 0a1d07837..fe2f5bcc9 100644
--- a/Shorewall-init/shorewall-init.service
+++ b/Shorewall-init/shorewall-init.service
@@ -6,6 +6,7 @@
 [Unit]
 Description=Shorewall IPv4 firewall (bootup security)
 Before=network.target
+Wants=network.target
 Conflicts=iptables.service firewalld.service
 
 [Service]
diff --git a/Shorewall-lite/shorewall-lite.service b/Shorewall-lite/shorewall-lite.service
index 76490236a..64b7133c7 100644
--- a/Shorewall-lite/shorewall-lite.service
+++ b/Shorewall-lite/shorewall-lite.service
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)
+Wants=network-online.target
 After=network-online.target
 Conflicts=iptables.service firewalld.service
 
diff --git a/Shorewall-lite/shorewall-lite.service.214 b/Shorewall-lite/shorewall-lite.service.214
index 76490236a..64b7133c7 100644
--- a/Shorewall-lite/shorewall-lite.service.214
+++ b/Shorewall-lite/shorewall-lite.service.214
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall (lite)
+Wants=network-online.target
 After=network-online.target
 Conflicts=iptables.service firewalld.service
 
diff --git a/Shorewall/shorewall.service b/Shorewall/shorewall.service
index 41223714e..db1bb9483 100644
--- a/Shorewall/shorewall.service
+++ b/Shorewall/shorewall.service
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall
+Wants=network-online.target
 After=network-online.target
 Conflicts=iptables.service firewalld.service
 
diff --git a/Shorewall/shorewall.service.214 b/Shorewall/shorewall.service.214
index 41223714e..db1bb9483 100644
--- a/Shorewall/shorewall.service.214
+++ b/Shorewall/shorewall.service.214
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv4 firewall
+Wants=network-online.target
 After=network-online.target
 Conflicts=iptables.service firewalld.service
 
diff --git a/Shorewall6-lite/shorewall6-lite.service b/Shorewall6-lite/shorewall6-lite.service
index 6ca161f9b..151bb2d5c 100644
--- a/Shorewall6-lite/shorewall6-lite.service
+++ b/Shorewall6-lite/shorewall6-lite.service
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall (lite)
+Wants=network-online.target
 After=network-online.target
 Conflicts=ip6tables.service firewalld.service
 
diff --git a/Shorewall6-lite/shorewall6-lite.service.214 b/Shorewall6-lite/shorewall6-lite.service.214
index 3f2f9dd01..71fe51531 100644
--- a/Shorewall6-lite/shorewall6-lite.service.214
+++ b/Shorewall6-lite/shorewall6-lite.service.214
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall (lite)
+Wants=network-online.target
 After=network-online.target
 Conflicts=ip6tables.service firewalld.service
 
diff --git a/Shorewall6/shorewall6.service b/Shorewall6/shorewall6.service
index 0d79c28c3..33859cc7d 100644
--- a/Shorewall6/shorewall6.service
+++ b/Shorewall6/shorewall6.service
@@ -6,6 +6,7 @@
 [Unit]
 Description=Shorewall IPv6 firewall
 After=network-online.target
+Wants=network-online.target
 Conflicts=ip6tables.service firewalld.service
 
 [Service]
diff --git a/Shorewall6/shorewall6.service.214 b/Shorewall6/shorewall6.service.214
index 0d79c28c3..70aa0e430 100644
--- a/Shorewall6/shorewall6.service.214
+++ b/Shorewall6/shorewall6.service.214
@@ -5,6 +5,7 @@
 #
 [Unit]
 Description=Shorewall IPv6 firewall
+Wants=network-online.target
 After=network-online.target
 Conflicts=ip6tables.service firewalld.service