Fixes and remove ums