Fixes for reshard on copy