Fix the token issues in the migration