[DF-3813] Review fixes