[DF-2822] fix review issues