[new_client]: Bug fixes