Changes to fix MMS in v2.1