Minor tweaks to allow testing of MPI submission