More fixes in the PDD code.