[DF-2241] fix review issues