Various fixes from review.