some fixes for p5