A couple more unicode changes.