Improve client recovery