Mm fixes