Fixing a few issues with /pl