diff --git a/dovecot.cf b/dovecot.cf
index 15572bb..3727f1b 100644
--- a/dovecot.cf
+++ b/dovecot.cf
@@ -10,6 +10,7 @@ classes:
 
 vars:
 	freebsd::
+		"service_name" string => "dovecot";
 		"cfg_dir" string => "/usr/local/etc/dovecot";
 		"dovecot_conf" string => "$(cfg_dir)/dovecot.conf";
 
@@ -84,14 +85,14 @@ methods:
 files:	
 	"$(cfg_dir)/."
 	create => "true",
-	perms => mog("755","root","root"),
+	perms => m("755"),
 	depends_on => {"dovecot_pkgs_installed"},
 	handle => "dovecot_cfg_dir_created";
 	
 	"$(dovecot_conf)"
 	classes => if_repaired(dovecot_repaired),
 	create => "true",
-	perms => mog("644","root","root"),
+	perms => m("644"),
 	template_method => "mustache",
 	depends_on => {"dovecot_pkgs_installed","dovecot_cfg_dir_created"},
 	handle => "dovecot_cfg_created",
@@ -103,25 +104,25 @@ files:
 		handle => "dovecot_imap_cert_installed",
 		classes => if_repaired(dovecot_repaired),
 		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[imap_cert])","noshell" )),
-		perms => mog("600","root","root");
+		perms => m("600");
 
 		"$(imap_key)" 
 		handle => "dovecot_imap_key_installed",
 		classes => if_repaired(dovecot_repaired),
 		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[imap_key])","noshell" )),
-		perms => mog("600","root","root");
+		perms => m("600");
 
 		"$(submission_cert)" 
 		handle => "dovecot_submission_cert_installed",
 		classes => if_repaired(dovecot_repaired),
 		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[submission_cert])","noshell" )),
-		perms => mog("600","root","root");
+		perms => m("600");
 
 		"$(submission_key)" 
 		handle => "dovecot_submission_key_installed",
 		classes => if_repaired(dovecot_repaired),
 		copy_from => local_dcp( execresult(  "/usr/bin/readlink -qfn $(cfg[submission_key])","noshell" )),
-		perms => mog("600","root","root");
+		perms => m("600");
 
 
 	
diff --git a/postfix.cf b/postfix.cf
index 55a47c2..9555c3f 100644
--- a/postfix.cf
+++ b/postfix.cf
@@ -8,7 +8,7 @@ vars:
 
 	freebsd::
 		"pkgs" slist => {
-			"postfix-sasl",
+			"postfix-mysql",
 		};
 		"db_dir" string => "/var/db";
 		"service_name" string => "postfix";
@@ -103,7 +103,7 @@ files:
 
 	"$(postfix.db_dir)/."
 	create => "true",
-	perms => mog("755","root","root"),
+	perms => m("755"),
 	handle => "postfix_db_dir_created";
 
 	"$(postfix.data_dir)/."