Fixed migrator issues.