Fix UTF-8 issues