[DF-2946] fix review issues