diff --git a/ad-auth/tasks/main.yml b/ad-auth/tasks/main.yml
index 566abfb2993a9fd3661766fdc7c9bef362f4901a..6344bd87668305dfbd1a4b9c3d385d28a56f944a 100644
--- a/ad-auth/tasks/main.yml
+++ b/ad-auth/tasks/main.yml
@@ -2,7 +2,12 @@
 # file: roles/ad-auth/tasks/main.yml
 
 - include: ldap.yml
+- meta: flush_handlers
 - include: nslcd.yml
+- meta: flush_handlers
 - include: nscd.yml
+- meta: flush_handlers
 - include: kerberos.yml
+- meta: flush_handlers
 - include: sudo.yml
+- meta: flush_handlers
diff --git a/ad-auth/tasks/nscd.yml b/ad-auth/tasks/nscd.yml
index 4e3b99aa5338fa87a5dd9698de2a3be86c1cbd1e..bce387aa939bf1abe8aa190f50a7a431cc8a5c6f 100644
--- a/ad-auth/tasks/nscd.yml
+++ b/ad-auth/tasks/nscd.yml
@@ -13,7 +13,7 @@
   tags: nscd config
 
 - name: ensure a happy nscd
-  file: path=/etc/netgroup state=file
+  file: path=/etc/netgroup state=touch
   notify:
     - restart nscd
     - clear nscd caches
diff --git a/nfs-client/tasks/main.yml b/nfs-client/tasks/main.yml
index cada86d86890a5574bb04aec6de117495e4ba9cc..e6467da461ebcca9d32651aca2484c9969cc7ca2 100644
--- a/nfs-client/tasks/main.yml
+++ b/nfs-client/tasks/main.yml
@@ -34,4 +34,6 @@
   script: create_netdir.sh pub
   tags: fsmpi
 
+- meta: flush_handlers
 - include: umask.yml
+- meta: flush_handlers
diff --git a/nfs-client/templates/auto.nfs.j2 b/nfs-client/templates/auto.nfs.j2
index ffdf59c69811d08fc792daa57e42083a4db41c4b..11cc345431834bec54784f3f9cfb8465057d4952 100644
--- a/nfs-client/templates/auto.nfs.j2
+++ b/nfs-client/templates/auto.nfs.j2
@@ -1,3 +1,3 @@
 {% for share in nfsshares %}
-	{{ share }}
+{{ share }}
 {% endfor %}