Fixes from review.
Fixes from review.