diff --git a/Shorewall-lite/lib.cli-lite b/Shorewall-lite/lib.cli-lite
index c5498351b..2bfb8fe25 100644
--- a/Shorewall-lite/lib.cli-lite
+++ b/Shorewall-lite/lib.cli-lite
@@ -155,15 +155,6 @@ verify_firewall_script() {
     fi
 }
 
-#
-# Fatal error
-#
-startup_error() {
-    echo "   ERROR: $@" >&2
-    kill $$
-    exit 1
-}
-
 #
 # Start Command Executor
 #
diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index 6cf0303b0..35b474a6d 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -33,6 +33,15 @@ fatal_error() # $@ = Message
     exit 2
 }
 
+#
+# Issue an error message and die
+#
+startup_error() {
+    echo "   ERROR: $@" >&2
+    kill $$
+    exit 1
+}
+
 #
 # Display a chain if it exists
 #
diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std
index 98ff291ab..9cee193bc 100644
--- a/Shorewall/lib.cli-std
+++ b/Shorewall/lib.cli-std
@@ -331,15 +331,6 @@ get_config() {
     esac
 }
 
-#
-# Issue an error message and die
-#
-startup_error() {
-    echo "   ERROR: $@" >&2
-    kill $$
-    exit 1
-}
-
 #
 # Determine if there are config files newer than the passed object
 #
@@ -1596,7 +1587,7 @@ compiler_command() {
 	compile)
 	    get_config Yes
 	    shift
-	    compile_command $@1
+	    compile_command $@
 	    ;;
 	refresh)
 	    get_config Yes Yes
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index c2d210efd..1c8d4d3d8 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -392,7 +392,7 @@ case "$COMMAND" in
 	get_config
 	[ -n "$g_debugging" ] && set -x
 	#
-	# Undocumented way to call functions in ${SHAREDIR}/functions directly
+	# Undocumented way to call functions in the libraries directly
 	#
 	shift
 	$@