Running with more than one MPI process per simulator revealed some problems. This fixes some of them.