AA fixes for PEQ's reported crash