PCL Compatibility modifications thus far