Fixed data migration issues