Bug fixes for MPIpe 1