A number of Large Vessel related fixes.