Couple more UTF-8 fixes