migrate: More bug fixes

Sighs.