More HarvestHandler bugfixes. =[