Fling fixes