Client fixes