[DF-2270] review fixes