diff --git a/New/Shorewall/Chains.pm b/New/Shorewall/Chains.pm
index ad320df48..8f32cb0c4 100644
--- a/New/Shorewall/Chains.pm
+++ b/New/Shorewall/Chains.pm
@@ -495,9 +495,11 @@ sub ensure_mangle_chain($) {
 #
 sub new_builtin_chain($$$)
 {
-    my $chainref = new_chain $_[0],$_[1];
+    my ( $table, $chain, $policy ) = @_;
+    
+    my $chainref = new_chain $table, $chain;
     $chainref->{referenced} = 1;
-    $chainref->{policy}     = $_[2];
+    $chainref->{policy}     = $policy;
     $chainref->{builtin}    = 1;
 }
 
@@ -677,7 +679,7 @@ sub mac_match( $ ) {
     my $mac = $_[0];
 
     $mac =~ s/^(!?)~//;
-    $mac =~ s/^!// if my $invert = $1 ? '! ' : ''; 
+    $mac =~ s/^!// if my $invert = ( $1 ? '! ' : ''); 
     $mac =~ s/-/:/g;
 
     "--match mac --mac-source ${invert}$mac ";
diff --git a/New/Shorewall/Proc.pm b/New/Shorewall/Proc.pm
index f4fecb17a..f15a442f4 100644
--- a/New/Shorewall/Proc.pm
+++ b/New/Shorewall/Proc.pm
@@ -1,5 +1,5 @@
 #
-# Shorewall 3.9 -- /usr/share/shorewall/Shorewall/Proc.pm
+# Shorewall 3.9 -- /usr/share/shorewall-pl/Shorewall/Proc.pm
 #
 #     This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
 #