Fixes based on the review.