cli small fixes