First round of fixes per CR