Harvest bugs

Two small bugfixes:

https://www.pivotaltracker.com/story/show/59724048
https://www.pivotaltracker.com/story/show/59531876