Fix client info in context