Attempt to fix migrations, schema and db