Repair some bad copy/pass