More migrate fixes.