Xcode clean up and another MPI fix.