Mp2 fixes