Corrected Client and Globals

Corrected Client and Globals