Fixes to harvester