Fixes a couple code reviews.