Some CR's was fixed. But not all.

Some CR's was fixed.