more utf8 fixes