MPI fixes. After latest merges we had the MPI vs. OMP checks made twice.