More Migrations Fixes