header + mm fixes