Fixed some bugs with indexing after harvesting