Fixing a couple of details related to the clonnable elements