Update to Harvest 2.2+