more fixes to SFA