Fixed a few MM bugs