Fix CLI messages