Fixing cloning issues.