diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm
index ed86611ad..f6d0dd0ab 100644
--- a/Shorewall/Perl/Shorewall/Zones.pm
+++ b/Shorewall/Perl/Shorewall/Zones.pm
@@ -1287,7 +1287,15 @@ sub verify_required_interfaces( $ ) {
     my $interfaces = find_interfaces_by_option 'wait';
 
     if ( @$interfaces ) {
-	emit "local waittime\n";
+	emit( "local waittime\n" );
+
+	emit( 'case "$COMMAND" in' );
+
+	push_indent;
+
+	emit( 'start|restart|restore)' );
+
+	push_indent;
 
 	for my $interface (@$interfaces ) {
 	    my $wait = $interfaces{$interface}{options}{wait};
@@ -1328,6 +1336,14 @@ sub verify_required_interfaces( $ ) {
 		$returnvalue = 1;
 	    }
 	}
+
+	emit( ";;\n" );
+	
+	pop_indent;
+	pop_indent;
+
+	emit( 'esac' );
+
     }
 
     $interfaces = find_interfaces_by_option 'required';
diff --git a/Shorewall/Perl/prog.header b/Shorewall/Perl/prog.header
index 9d0fafb40..f5f865656 100644
--- a/Shorewall/Perl/prog.header
+++ b/Shorewall/Perl/prog.header
@@ -697,7 +697,7 @@ startup_error() # $* = Error Message
 	    ;;
     esac
 
-    if [ $LOG_VERBOSITY -gt 1 ]; then
+    if [ $LOG_VERBOSITY -ge 0 ]; then
         timestamp="$(date +'%_b %d %T') "
 
 	case $COMMAND in