[DF-3919] review fixes