Fix build w/o MPI, minor cleanup