Minor client improvements