Fix occasional unicode comparison issues