Attempt to fix command line client auth issues.