Some small changes to copy