[DF-1537] fix some review issues