Fix up feature/mpi-only branch

Rather than just comment on #522, I thought I would just make my fixes.

See individual commits for fixes.