Harvester

Additional fixes to #158.