Resolve some bad clipping