Fixed CR comments