Some bugs fixing after final

MMS bugs fixing.