diff --git a/plugins/dress_zmq/dress_slave.irp.f b/plugins/dress_zmq/dress_slave.irp.f
index 560f536d..0b742003 100644
--- a/plugins/dress_zmq/dress_slave.irp.f
+++ b/plugins/dress_zmq/dress_slave.irp.f
@@ -1,4 +1,4 @@
-subroutine dress_slave()
+subroutine dress_slave
   implicit none
   BEGIN_DOC
 ! Helper program to compute the dress in distributed mode.
diff --git a/plugins/mrcepa0/mrcc_slave.irp.f b/plugins/mrcepa0/mrcc_slave.irp.f
index 83295985..655536ff 100644
--- a/plugins/mrcepa0/mrcc_slave.irp.f
+++ b/plugins/mrcepa0/mrcc_slave.irp.f
@@ -25,7 +25,11 @@ subroutine run_wf
   double precision :: energy(N_states_diag)
   character*(64) :: states(1)
   integer :: rc, i
-  
+ 
+ integer, external              :: zmq_get_dvector, zmq_get_N_det_generators 
+  integer, external              :: zmq_get_psi, zmq_get_N_det_selectors
+  integer, external              :: zmq_get_N_states_diag
+       
   call provide_everything
   
   zmq_context = f77_zmq_ctx_new ()
@@ -47,7 +51,14 @@ subroutine run_wf
       ! ---------
 
       print *,  'mrcc'
-      call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states)
+      !call wall_time(t0)
+      if (zmq_get_psi(zmq_to_qp_run_socket,1) == -1) cycle
+      if (zmq_get_N_det_generators (zmq_to_qp_run_socket, 1) == -1) cycle
+      if (zmq_get_N_det_selectors(zmq_to_qp_run_socket, 1) == -1) cycle
+      if (zmq_get_dvector(zmq_to_qp_run_socket,1,'energy',energy,N_states) == -1) cycle
+
+      !call wall_time(t1)
+      !call write_double(6,(t1-t0),'Broadcast time')
 
       PROVIDE psi_bilinear_matrix_columns_loc psi_det_alpha_unique psi_det_beta_unique
       PROVIDE psi_bilinear_matrix_rows psi_det_sorted_order psi_bilinear_matrix_order
diff --git a/plugins/mrcepa0/mrcc_stoch_routines.irp.f b/plugins/mrcepa0/mrcc_stoch_routines.irp.f
index d97308e1..7205837a 100644
--- a/plugins/mrcepa0/mrcc_stoch_routines.irp.f
+++ b/plugins/mrcepa0/mrcc_stoch_routines.irp.f
@@ -75,7 +75,6 @@ subroutine ZMQ_mrcc(E, mrcc, delta, delta_s2, relative_error)
 !  end do
 
   integer(ZMQ_PTR), external     :: new_zmq_to_qp_run_socket
-  integer, external              :: add_task_to_taskserver, zmq_set_running
   integer                        :: ipos
   ipos=1
   do i=1,N_mrcc_jobs