Add some trace info as well as update CLIENT_ flags