DF-742 code review fixes