Fixes for #865 UPS/USPS notices

Includes fixes for the UPS/USPS notices reported by @misulicus in #865.