More adjustments to xPDO references