Client tweaks