Fixes and remove UMS