Client tweaks.

Various client tweaks.