fix two issues in SAA