This relives some of the issues in the mpi_skip branch, forgot to push this fix, really part of that