[DF-2983] Fix after code review.
[DF-3169] Fix after code review.