Another batch of changes on the migration scripts