Few more CR comments