Minor updates in ClientContext