Fix some more utf issues.