[DF-3718] Review fixes