[DF-5024] Review fixes.