Fix CRs