mp2 fixes