More migration script fixes.