MOSYNC-2823. Small changes after code review.