Added missing changes needed for sucessfull migration.