Small changes to client. (reverse-merged from commit c5e526dd8e037eb50c4bcfe919b35512b614643f)