Fixing some migration issues from old vrsions