[WIP] Harvester fixes - second attempt