PL fixes from code review