Small ad-hoc fixes for MPI part