Use MgM instead of M now; fix build