More fixes to PDS