Fixed issues in CLI messages