Fixes from review.