diff --git a/roles/enable_lmod/vars/main.yml b/roles/enable_lmod/vars/main.yml
index ce2423328fad285e5b22b30a5257051c4475c96b..b6b95b3ccc9b22614562a7e1024d76d10802f4a4 100644
--- a/roles/enable_lmod/vars/main.yml
+++ b/roles/enable_lmod/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 source_dir: /tmp
-soft_dir: /usr/local
+soft_dir: /opt/lmod/
 lmod_version: 5.8.6
diff --git a/roles/gluster_client/tasks/main.yml b/roles/gluster_client/tasks/main.yml
index e3939459cea19ff7569b41be9f2f6238d4f1d668..c27e4a7ad1f2ee1280c52942498d22dd9f8cc489 100644
--- a/roles/gluster_client/tasks/main.yml
+++ b/roles/gluster_client/tasks/main.yml
@@ -13,6 +13,6 @@
   sudo: true
 
 - name: mount volume
-#mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,acl,_netdev,backupvolfile-server={{ gluster_servers[1] }}"
-  mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,acl,backupvolfile-server={{ gluster_servers[1] }},comment=systemd.automount"
+  mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,acl,_netdev,backupvolfile-server={{ gluster_servers[1] }}"
+#  mount: name="{{ volmnt }}" src="{{ gluster_servers[0] }}:/{{ volname }}" state="mounted" fstype="glusterfs" opts="defaults,_netdev,acl,backupvolfile-server={{ gluster_servers[1] }},comment=systemd.automount"
   sudo: true
diff --git a/roles/lmod/vars/main.yml b/roles/lmod/vars/main.yml
index ce2423328fad285e5b22b30a5257051c4475c96b..b6b95b3ccc9b22614562a7e1024d76d10802f4a4 100644
--- a/roles/lmod/vars/main.yml
+++ b/roles/lmod/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 source_dir: /tmp
-soft_dir: /usr/local
+soft_dir: /opt/lmod/
 lmod_version: 5.8.6
diff --git a/roles/nagios_monitored/files/scripts/check_munge b/roles/nagios_monitored/files/scripts/check_munge
index 5e94412c7cdbb369f81c7ee6643aa74d2a436059..7c48d3216df5ae37b66c86e718bd49665d530d9d 100755
--- a/roles/nagios_monitored/files/scripts/check_munge
+++ b/roles/nagios_monitored/files/scripts/check_munge
@@ -7,7 +7,7 @@ import subprocess
 STATE_OK=0
 STATE_WARNING=1
 
-check_munge=subprocess.Popen("service munge status", shell=True, stdout=subprocess.PIPE)
+check_munge=subprocess.Popen(["/sbin/service","munge","status"], shell=False, stdout=subprocess.PIPE)
 munge_status=check_munge.communicate()[0]
 
 if "run" in munge_status:
diff --git a/roles/nagios_monitored/files/scripts/check_slurm b/roles/nagios_monitored/files/scripts/check_slurm
index 0ec5a59f961614ad23f6ec0a880b36875049ff76..c5ccbef7be1f95fef6a04e34920a4713f98b9798 100755
--- a/roles/nagios_monitored/files/scripts/check_slurm
+++ b/roles/nagios_monitored/files/scripts/check_slurm
@@ -7,7 +7,7 @@ import subprocess
 STATE_OK=0
 STATE_WARNING=1
 
-check_slurm=subprocess.Popen("service slurm status", shell=True, stdout=subprocess.PIPE)
+check_slurm=subprocess.Popen(["/sbin/service","slurm","status"], shell=False, stdout=subprocess.PIPE)
 slurm_status=check_slurm.communicate()[0]
 
 if "run" in slurm_status:
diff --git a/roles/nagios_monitored/files/scripts/check_slurmdbd b/roles/nagios_monitored/files/scripts/check_slurmdbd
index fbb08b96c6b7eae8d789c14ad638171addea8b4a..82f1459ebd1164422b40aa9328e682f4a5ea6a33 100755
--- a/roles/nagios_monitored/files/scripts/check_slurmdbd
+++ b/roles/nagios_monitored/files/scripts/check_slurmdbd
@@ -7,7 +7,7 @@ import subprocess
 STATE_OK=0
 STATE_WARNING=1
 
-check_slurmdbd=subprocess.Popen("service slurmdbd status", shell=True, stdout=subprocess.PIPE)
+check_slurmdbd=subprocess.Popen(["/sbin/service","slurmdbd","status"], shell=False, stdout=subprocess.PIPE)
 slurmdbd_status=check_slurmdbd.communicate()[0]
 
 if "run" in slurmdbd_status:
diff --git a/roles/provision_homedir/templates/provision_homedir.py.j2 b/roles/provision_homedir/templates/provision_homedir.py.j2
index b601f099540b6c3126bcc4137001d6579fe69278..e998d712d5d37c3ec6cbefee10ff6a837222e25c 100644
--- a/roles/provision_homedir/templates/provision_homedir.py.j2
+++ b/roles/provision_homedir/templates/provision_homedir.py.j2
@@ -63,11 +63,17 @@ s.bindpw="{{ ldapBindDNPassword }}"
 s.baseDN="{{ ldapBase }}"
 s.searchFilter = "{{ search_filter }}"
 homeDirEntry= "{{ homeDirEntry }}"
+homebase = "{{ homebase }}"
+
 
 users=get_users(s)
 for user in users:
 	try:
-		mk_homedir(users[user].entry[homeDirEntry][0],int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0]))
+                if homebase != "":
+                    path=homebase+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1]
+                else:
+                    path=users[user].entry[homeDirEntry][0]
+		mk_homedir(path,int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0]))
 	except:
 		print traceback.format_exc()
 		pass
diff --git a/roles/provision_homedir/vars/main.yml b/roles/provision_homedir/vars/main.yml
index ded62ea83ce3a9792a72c0393eeeb8b5e34e94b2..1bd13c0514a0e2593bae2f10b4745af49cc03690 100644
--- a/roles/provision_homedir/vars/main.yml
+++ b/roles/provision_homedir/vars/main.yml
@@ -3,3 +3,4 @@ use_active_directory: False
 provision_homedir: /usr/local/sbin/provision_homedir.py
 homeDirEntry: "{% if use_active_directory %}unixHomeDirectory{% else %}homeDirectory{% endif %}"
 search_filter: "{% if use_active_directory %}(unixHomeDirectory=*){% else %}(objectClass=posixAccount){% endif %}"
+homebase: ""