Fixes based on review.