Fix migration provider

Some more fixes