sorting out migration issues