Fixing Migration bugs