More copy related fixes. #184