Fixed issues with pirates