More adjustments for copy changes