Sort fixes and update aaq.