Fix up some migration scripts