Further PCL changes