Fixed client initialization