migrate: Fix calls to functions
Merge pull request #1403 from mc10/migrate

migrate: Fix calls to functions
migrate: Another one...