Resubmitted UPS fixes

Got lost from my previous PR