small fixes for the cli