Avoid using m_client.
Fixes for state getting.
Merge branch 'webthree' into develop