Some fixes, catch-up in MPI