Clean up some issues on the pirate ship