Fixes

Merge and close branch pl