fixing up the migration issues and putting back the correct migrations