Fix issues raised on pull request comments