Various AAX fixes.