Fixing some migration issues