Fixes to the MBS validation/invalidation code.