fixes to SFA