mm fixes