Incorporated fixes from review.