Update for p1stream changes.