Client fixes.