Fling fixes
Merge pull request #1094 from Fuzzysqurl/beautifly

Fling fixes