Fix client boostrap.