Minor harvester related fixes.