[MBS] Two bugs in 16.0 fixed