CR second round fixes