Fixed references to static properties of Client (settings and client)