Tweaks for new harvest directory