migration issues fix