Fix a bunch of stuff that was found in review.