more p2 fixes