Fixed USPS bugs