Fixing Migration issues