357 - OS UPS fixes