[PD] pdp fixes