Fixes for opt-in `Copy`