UIV-904 small fixes