utf-8 fixes, again