Remove atomic block in SFA, and fix some problems in SFAPin