:bug: Cli fixes