addressing some of the remaining occurrences of SfaRecord