Applying fixes to 'clone' and 'add new variation'