More fixes for PBSPro.