Minor tweaks to client