Various improvements around MRBS