Bug fixes in the command line app.