more pcl fixes