Small cosmetic improvements to client connection