Changes for MMS fixes