Fixing various things from review.