Fix AAI connection issues