Ticket-1234: fixes per code review