Some changes to make harvesting more solid.