Client connect repairs