Migration fixups

Hopefully this works