diff --git a/plugins/Full_CI_ZMQ/selection_davidson_slave.irp.f b/plugins/Full_CI_ZMQ/selection_davidson_slave.irp.f
index fc12a16a..7da6626c 100644
--- a/plugins/Full_CI_ZMQ/selection_davidson_slave.irp.f
+++ b/plugins/Full_CI_ZMQ/selection_davidson_slave.irp.f
@@ -69,7 +69,6 @@ subroutine run_wf
       ! --------
 
       print *,  'Davidson'
-      print *,  'PT2'
       if (mpi_master) then
         call zmq_get_psi(zmq_to_qp_run_socket,1,energy,N_states)
       endif
diff --git a/plugins/MPI/broadcast.irp.f b/plugins/MPI/broadcast.irp.f
index 11c5698a..c2d238a6 100644
--- a/plugins/MPI/broadcast.irp.f
+++ b/plugins/MPI/broadcast.irp.f
@@ -13,19 +13,19 @@ subroutine mpi_bcast_psi(energy, size_energy)
     integer :: ierr
 
     call MPI_BCAST (N_states, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast N_states'
       stop -1
     endif
 
     call MPI_BCAST (N_det, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast N_det'
       stop -1
     endif
 
     call MPI_BCAST (psi_det_size, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast psi_det_size'
       stop -1
     endif
@@ -34,15 +34,15 @@ subroutine mpi_bcast_psi(energy, size_energy)
       TOUCH psi_det_size N_det N_states
     endif
 
-    print *,  size(psi_det), psi_det_size
+    
     call MPI_BCAST (psi_det, size(psi_det), MPI_BIT_KIND, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast psi_det'
       stop -1
     endif
 
     call MPI_BCAST (psi_coef, size(psi_coef), MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast psi_coef'
       stop -1
     endif
@@ -52,7 +52,7 @@ subroutine mpi_bcast_psi(energy, size_energy)
     endif
 
     call MPI_BCAST (N_det_generators, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast N_det_generators'
       stop -1
     endif
@@ -62,7 +62,7 @@ subroutine mpi_bcast_psi(energy, size_energy)
     endif
 
     call MPI_BCAST (N_det_selectors, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast N_det_selectors'
       stop -1
     endif
@@ -72,7 +72,7 @@ subroutine mpi_bcast_psi(energy, size_energy)
     endif
 
     call MPI_BCAST (energy, size(energy), MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
-    if (ierr /= 0) then
+    if (ierr /= MPI_SUCCESS) then
       print *,  'Unable to broadcast energy'
       stop -1
     endif
diff --git a/plugins/MPI/mpi.irp.f b/plugins/MPI/mpi.irp.f
index cd1dbb79..845f3dd5 100644
--- a/plugins/MPI/mpi.irp.f
+++ b/plugins/MPI/mpi.irp.f
@@ -27,7 +27,7 @@ BEGIN_PROVIDER [ logical, mpi_initialized ]
   include 'mpif.h'
   integer                        :: ierr
   call mpi_init(ierr)
-  if (ierr /= 0) then
+  if (ierr /= MPI_SUCCESS) then
     print *,  'ierr = ', ierr
     stop 'Unable to initialize MPI'
   endif
@@ -48,14 +48,14 @@ END_PROVIDER
   integer                        :: ierr
 
   call MPI_COMM_RANK (MPI_COMM_WORLD, mpi_rank, ierr)
-  if (ierr /= 0) then
+  if (ierr /= MPI_SUCCESS) then
     print *,  'ierr = ', ierr
     stop 'Unable to get MPI rank'
   endif
   call write_int(6,mpi_rank,'MPI rank')
 
   call MPI_COMM_SIZE (MPI_COMM_WORLD, mpi_size, ierr)
-  if (ierr /= 0) then
+  if (ierr /= MPI_SUCCESS) then
     print *,  'ierr = ', ierr
     stop 'Unable to get MPI size'
   endif