[DF-4612] review fixes