Small fixes for unicode

@dianakhuang: should address issue I was seeing on prod yesterday