More fixes to SFs