[POLISH] Copy tweaks