Fling, Herb, Embargo fixes
Merge pull request #869 from Fuzzysqurl/Fling

Fling, Herb, Embargo fixes