More migration fixes