Fix Gabiano in CompositeShips

Github to the rescue
(also lots of other stuff, but who cares)