More UTF-8 / UTF-16 fixes.