[DF-3732] Review fixes