Various client improvements