Fixes for MD-FRM