Fix roto clone functions