Migration fixups