Small fixes in CLI app.