[DF-3517] Review fixes