[DF-4152] Review fixes.