saa: minor changes