more copy fixes