Tighten up more unicode