States fixes for server & client.