Remaining UPS fixes