UC-77 Fixes per code review