More client options fixing