PD page fixes