fixing some umms

Change-Id: If36e12988862af358d5035c3feec777ffd1e1417