Add fixes for SFC data model changes.