Improvements to the cloning.