Changes required by pull-request reviewers