Fixes for the CLI

There were several methods that the CLI was using that didn't exist in the client.
Any reason we're not returning the output from this as json?