Get the command-line client working again