More bugfixes for MPI version.