more utf-8 fixes