Fix for migration issues