Small changes requested in code review.