Fix fixing and cloning