small fixes to aa_escape