Re: [Mpi-21] A couple of bugs in 2.1