Changes following own CR.