Small improvements to SAO (performance/looks)