More client verification changes