UMS Fix and some cleanup