Fixes to PL

Merge and delete