mmi fixes