diff --git a/src/cipsi/slave_cipsi.irp.f b/src/cipsi/slave_cipsi.irp.f
index 04d46170..59022519 100644
--- a/src/cipsi/slave_cipsi.irp.f
+++ b/src/cipsi/slave_cipsi.irp.f
@@ -53,7 +53,7 @@ subroutine run_slave_main
 
   PROVIDE psi_det psi_coef threshold_generators state_average_weight mpi_master
   PROVIDE zmq_state N_det_selectors pt2_stoch_istate N_det pt2_e0_denominator
-  PROVIDE N_det_generators N_states N_states_diag pt2_e0_denominator
+  PROVIDE N_det_generators N_states N_states_diag pt2_e0_denominator mpi_rank
 
   IRP_IF MPI
     call MPI_BARRIER(MPI_COMM_WORLD, ierr)
diff --git a/src/davidson/davidson_parallel.irp.f b/src/davidson/davidson_parallel.irp.f
index d5ca9dee..811fe5e3 100644
--- a/src/davidson/davidson_parallel.irp.f
+++ b/src/davidson/davidson_parallel.irp.f
@@ -13,7 +13,6 @@ end
 subroutine davidson_slave_tcp(i)
   implicit none
   integer, intent(in)            :: i
-  call sleep(1) ! Let the master start
   call davidson_run_slave(0,i)
 end
 
@@ -37,15 +36,14 @@ subroutine davidson_run_slave(thread,iproc)
 
   integer, external              :: connect_to_taskserver
 
-  PROVIDE mpi_rank
   zmq_to_qp_run_socket = new_zmq_to_qp_run_socket()
-  zmq_socket_push      = new_zmq_push_socket(thread)
-
-
 
   if (connect_to_taskserver(zmq_to_qp_run_socket,worker_id,thread) == -1) then
+    call end_zmq_to_qp_run_socket(zmq_to_qp_run_socket)
     return
   endif
+
+  zmq_socket_push      = new_zmq_push_socket(thread)
       
   call davidson_slave_work(zmq_to_qp_run_socket, zmq_socket_push, N_states_diag, N_det, worker_id)
 
@@ -59,7 +57,6 @@ subroutine davidson_run_slave(thread,iproc)
   endif
 
   call end_zmq_to_qp_run_socket(zmq_to_qp_run_socket)
-  call end_zmq_push_socket(zmq_socket_push,thread)
 end subroutine