Fixed CR's.

Fixed CR's.