Index copy tweaks