Fixes for PiratePig