Fix a FindBugs exclusion.
Fix encoding for Cli.