More client improvements