More fixes from review.