More UTF-8 fixes