Fixed more MPI issues