Fix fails after removing setClientOptions