Fixes in migration