Touching up a few unicode-related things