Copy fixes.
Merge pull request #59 from christensenep/copy-fixes

Copy fixes.