Fixed client initialization 2