[UP-3732]  Fixes based on code review comments.