Add client fixes.