Fix the BuildClient