Minor p5vp6 updates