Additional fixes from review.