Client fixes develop