Fling fixes

15th time is the charm?