Wavegen and UPS fix