Fixed issues with sample data cloning.