More MBS work and changes to block metadata