DF-1114 code review fixes