[WIP] Harvester fixes