diff --git a/Shorewall/firewall b/Shorewall/firewall
index a1a3d595c..a65c4ebdf 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -4353,7 +4353,7 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
     while read z1 z2 chain; do
 	if [ "$z1" = "$zone" ]; then
 	    if [ "$z2" = "$FW" ]; then
-		qt iptables -D `input_chain $interface` -i $interface -s $host -j $chain 
+		qt iptables -D `input_chain $interface` -s $host -j $chain 
 	    else
 		source_chain=`forward_chain $interface`
 		eval dest_hosts=\"\$${z2}_hosts\"
@@ -4608,6 +4608,9 @@ do_initialize() {
     fi
     OLD_PING_HANDLING=`added_param_value_yes OLD_PING_HANDLING $OLD_PING_HANDLING`
 
+    [ -z "$OLD_PING_HANDLING" -a -n "$FORWARDPING" ] && \
+	startup_error "FORWARDPING=Yes is incompatible with OLD_PING_HANDLING=No"
+
     run_user_exit params
 
     #
diff --git a/Shorewall/shorewall b/Shorewall/shorewall
index 8b0e6b04f..8af86e013 100755
--- a/Shorewall/shorewall
+++ b/Shorewall/shorewall
@@ -649,7 +649,7 @@ case "$1" in
 	[ $# -ne 3 ] && usage 1
 	exec $FIREWALL $debugging $nolock $1 $2 $3
 	;;
-    show)
+    show|list)
 	[ $# -gt 2 ] && usage 1
 	case "$2" in
 	connections)