Better treatment of MPI runs.