Fixed a couple bugs that were impacting harvesting