Fix to defaults for Client construction