More fixes for pd/pD