See #170: more copy fixes

6 jobs for 170-copy in 4 minutes and 54 seconds (queued for 2 seconds)