Fixes to skipPD.