A few fixes from code review.