Fixed migration issues for new clones