fixes for MPI