Minor tweaks to PiratePig