Some changes to hopefully make the migration easier to run in prod