Changes to fix MMS in v2.1

This could confirm my comment above.