MPI related compilation fixes.
Merge pull request #1 from hernando/mpi

Mpi related compilation fixes.