TRIBS-106 - Copy fixes