Minor client changes