some harvesting fixes