Tweaks to AA
Olaf tweaks.