Continue fixing mpi.d.