UIW: fix minor issues

Change-Id: I671b2599aa061f584f28b988cee3a195fd3f7ee8