More migration fixes (again).