Handling some diacritics fails for UPS labels.  Also correcting a bug in setting customer name as company name.