DF-656 code review fixes