some more p5 fixes