diff --git a/roles/set_semaphore_count/tasks/main.yml b/roles/set_semaphore_count/tasks/main.yml
index f1fcdff7ba962d2c7737c05587dfbabd6a0298b4..625791e95112818fdc98a9b43d76b2e93c86ed32 100644
--- a/roles/set_semaphore_count/tasks/main.yml
+++ b/roles/set_semaphore_count/tasks/main.yml
@@ -44,9 +44,10 @@
   command: cat /proc/sys/kernel/sem
   register: current_sem
   changed_when: current_sem.stdout not in "{{ SEM_COUNT }}"
+  check_mode: no
 
-- debug:
-    var: current_sem
+#- debug:
+#    var: current_sem
 
 - name: set semaphore count now 
   shell: "/usr/bin/echo {{ SEM_COUNT }}   > /proc/sys/kernel/sem"
diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index 14eee2dac9ffd693b2988efb861b2327e60f7c20..c34fc3bc16b7c96f167d12cec8f40123e234b813 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -76,11 +76,21 @@
 #  become: true
 #  ignore_errors: true
 
+- name: start slurmctl
+  service: name=slurmctld state=started enabled={{ start_slurmctld }}
+  become: true
+  when: use_systemd is defined and start_slurmctld
+
 - name: start slurmctl
   service: name=slurmctld state=restarted enabled={{ start_slurmctld }}
   become: true
   when: use_systemd is defined and start_slurmctld is defined and slurmctld_service_installed.changed
 
+- name: start slurmd
+  service: name=slurmd state=started enabled={{ slurmd_enabled }}
+  become: true
+  when: use_systemd is defined and start_slurmd is defined
+
 - name: start slurmd
   service: name=slurmd state=restarted enabled={{ slurmd_enabled }}
   become: true