fix regressions for new mm rest implementation