SFA fixes and benchmarks