Re: Some small CLI changes