Changes following pull request review