Still more edits for MPI