Fix encoding issues