fixes for copy and move