diff --git a/Shorewall-perl/prog.header b/Shorewall-perl/prog.header
index 2f4a17ec4..f324c1139 100644
--- a/Shorewall-perl/prog.header
+++ b/Shorewall-perl/prog.header
@@ -119,10 +119,8 @@ qt1()
     while [ 1 ]; do
 	"$@" >/dev/null 2>&1
 	status=$?
-	[ $status -ne 4 ] && break
+	[ $status -ne 4 ] && return $status
     done
-
-    return $status
 }
 
 #
diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall
index 77b62a5e3..189f095e2 100755
--- a/tools/build/buildshorewall
+++ b/tools/build/buildshorewall
@@ -37,8 +37,8 @@
 #
 # If no options are given, all options are assumed.
 #
-# If <previous version> is given, a patch file reflecting the differences
-# between that version and the current version ( <version> ) is
+# If <previous version> is given, patch files reflecting the differences
+# between that version and the current version ( <version> ) are generated
 # generated. The directory ./shorewall-<previous version> must exist and
 # contain the version against which the patch is generated.
 ################################################################################