Fix cli bugs introduced in last cli bug fixing fix
Fix cli bugs introduced in last cli bug fixing fix

Flikofbluelight747/opal,Mogztter/opal,fazibear/opal,castwide/opal,Ajedi32/opal,gabrielrios/opal,castwide/opal,wied03/opal,iliabylich/opal,suyesh/opal,jannishuebl/opal,Mogztter/opal,c42engineering/opal,gausie/opal,kachick/opal,gabrielrios/opal,catprintlabs/opal,domgetter/opal,domgetter/opal,bbatsov/opal,gabrielrios/opal,opal/opal,c42engineering/opal,wied03/opal,kachick/opal,c42engineering/opal,jannishuebl/opal,catprintlabs/opal,bbatsov/opal,iliabylich/opal,fazibear/opal,fazibear/opal,gausie/opal,iliabylich/opal,Ajedi32/opal,opal/opal,opal/opal,suyesh/opal,jgaskins/opal,merongivian/opal,suyesh/opal,gausie/opal,kachick/opal,catprintlabs/opal,merongivian/opal,merongivian/opal,opal/opal,Ajedi32/opal,Mogztter/opal,castwide/opal,jgaskins/opal,jgaskins/opal,Flikofbluelight747/opal,jannishuebl/opal,wied03/opal,Flikofbluelight747/opal,Mogztter/opal,kachick/opal,bbatsov/opal