Handle more weirdness in unicode