[DF-1537] fix review issues