FIX: still some more unicode fixes...