Fix changes recommended by pull request