Small fixes from review.