diff --git a/Shorewall-perl/Shorewall/Actions.pm b/Shorewall-perl/Shorewall/Actions.pm
index 25abb7c7b..1b3cb609d 100644
--- a/Shorewall-perl/Shorewall/Actions.pm
+++ b/Shorewall-perl/Shorewall/Actions.pm
@@ -589,12 +589,12 @@ sub process_actions3 () {
 
 	my @tag = split /,/, $tag;
 
-	fatal_error 'Limit rules must include <set name>,<max connections>,<interval> as the log tag' unless @tag == 3;
+	fatal_error 'Limit rules must include <set name>,<max connections>,<interval> as the log tag (' . join( ':', 'Limit', $level eq '' ? 'none' : $level , $tag ) . ')' unless @tag == 3;
 
 	my $set   = $tag[0];
 
 	for ( @tag[1,2] ) {
-	    fatal_error "Max connections and interval in Limit rules must be numeric" unless /^\d+$/
+	    fatal_error 'Max connections and interval in Limit rules must be numeric (' . join( ':', 'Limit', $level eq '' ? 'none' : $level, $tag ) . ')' unless /^\d+$/
 	}
 
 	my $count = $tag[1] + 1;
diff --git a/manpages/shorewall.conf.xml b/manpages/shorewall.conf.xml
index 919ce2466..faffb7cd3 100644
--- a/manpages/shorewall.conf.xml
+++ b/manpages/shorewall.conf.xml
@@ -392,7 +392,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><emphasis role="bold">DETECT_DNAT_ADDRS=</emphasis>[<emphasis
+        <term><emphasis role="bold">DETECT_DNAT_IPADDRS=</emphasis>[<emphasis
         role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>]</term>
 
         <listitem>
@@ -403,7 +403,7 @@
           to <emphasis role="bold">No</emphasis> or <emphasis
           role="bold">no</emphasis>, Shorewall will not detect this address
           and any destination IP address will match the DNAT rule. If not
-          specified or empty, “DETECT_DNAT_ADDRS=Yes” is assumed.</para>
+          specified or empty, “DETECT_DNAT_IPADDRS=Yes” is assumed.</para>
         </listitem>
       </varlistentry>