Fixed things from review.