Fixes for the CLI

There were several methods that the CLI was using that didn't exist in the client.