Copy fixes, thanks to Larissa Lima
Merge branch 'copy_fixes'

* copy_fixes:
  Copy fixes, thanks to Larissa Lima