Additional fixes to mmp script.