More CR comments fixed