Minor client fixes.