Fixing a couple comments from the review.