diff --git a/manifests/acl.pp b/manifests/acl.pp
index bc6ce80d..76bf9fbd 100644
--- a/manifests/acl.pp
+++ b/manifests/acl.pp
@@ -19,13 +19,14 @@
   $aclname = $name,
   $data = [],
 ) {
+  # Is this redudant now, or do we include dns::server base?
   include dns::server::params
 
   validate_string($aclname)
   validate_array($data)
 
   concat::fragment { "named.conf.local.acl.${name}.include":
-    target  => "${dns::server::params::cfg_dir}/named.conf.local",
+    target  => "${dns::server::cfg_dir}/named.conf.local",
     order   => 2,
     content => template("${module_name}/acl.erb"),
   }
diff --git a/manifests/server/options.pp b/manifests/server/options.pp
index 4b5f00c9..e8ec2b22 100644
--- a/manifests/server/options.pp
+++ b/manifests/server/options.pp
@@ -129,7 +129,7 @@
   $check_names_master = undef,
   $check_names_slave = undef,
   $check_names_response = undef,
-  $data_dir = $::dns::server::params::data_dir,
+  $data_dir = $::dns::server::data_dir,
   $dnssec_validation = $::dns::server::params::default_dnssec_validation,
   $dnssec_enable = $::dns::server::params::default_dnssec_enable,
   $forward_policy = undef,
@@ -147,10 +147,10 @@
   $transfer_source = undef,
   $working_dir = $::dns::server::params::working_dir,
   $zone_notify = undef,
+  $cfg_dir = $::dns::server::cfg_dir,
 ) {
   $valid_check_names = ['fail', 'warn', 'ignore']
   $valid_forward_policy = ['first', 'only']
-  $cfg_dir = $::dns::server::params::cfg_dir
 
   if ! defined(Class['::dns::server']) {
     fail('You must include the ::dns::server base class before using any dns options defined resources')
diff --git a/manifests/zone.pp b/manifests/zone.pp
index 4e5998fa..04edff4e 100644
--- a/manifests/zone.pp
+++ b/manifests/zone.pp
@@ -174,11 +174,9 @@
   $zone_notify = undef,
   $also_notify = [],
   $ensure = present,
-  $data_dir = $::dns::server::params::data_dir,
+  $data_dir = $::dns::server::data_dir,
+  $cfg_dir = $::dns::server::cfg_dir,
 ) {
-
-  $cfg_dir = $dns::server::params::cfg_dir
-
   validate_array($allow_transfer)
   validate_array($allow_forwarder)
   if !member(['first', 'only'], $forward_policy) {
diff --git a/templates/zone.erb b/templates/zone.erb
index b5ce551d..b5155f13 100644
--- a/templates/zone.erb
+++ b/templates/zone.erb
@@ -15,9 +15,9 @@ zone "<%= @zone %>" {
 <% end -%>
 <% if @zone_type == 'slave' or @zone_type == 'stub' -%>
 <%- if @slave_masters.is_a?(Array) -%>
-    masters { <%= @slave_masters.join(";") %>;};
+    masters { <%= @slave_masters.join(";") %>; };
 <%- else -%>
-    masters { <%= @slave_masters %>;};
+    masters { <%= @slave_masters %>; };
 <%- end -%>
 <% elsif @zone_type == 'master' -%>
     <%- if @allow_transfer.is_a?(Array) and @allow_transfer.size != 0 -%>