more multi-byte utf8 fixes