cli fixes

Thanks,
Alexey