Simple Client fixes