ModelMigrator bugfix + MigrationsGenerator bugfix