Some temporaray fixes to psdXXX.