[DF-2748] fix review issues