Correct encoding issues