Changes to fix MMS in v2.1

What were you trying to do here? Just asking!