[DF-1970] Review fixes