Minor client tweaks