Some small CLI changes