More edits to encoding issues.