Improvements to pirate (corsair)