migration issues fixes