cloning fixes