Fix uft8 issues