Fix a few minor errors from PR review.