Fixes to PL