UI-121 small changes