[DF-2437] fix review issues