Various cloneEffect fixes