Small fixes in cli command