Corrections according to pull request review.