Fix up feature/mpi-only branch

See individual commits for fixes.