Fix errors in CSFR updates.