Fix some p1s